Move some packages to pkg directory

pkg/name/name.go

@@ -0,0 +1,46 @@
+/*
+© Copyright IBM Corporation 2017, 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package name contains code to manage the queue manager name
+package name
+
+import (
+	"os"
+	"regexp"
+)
+
+// sanitizeQueueManagerName removes any invalid characters from a queue manager name
+func sanitizeQueueManagerName(name string) string {
+	var re = regexp.MustCompile("[^a-zA-Z0-9._%/]")
+	return re.ReplaceAllString(name, "")
+}
+
+// GetQueueManagerName resolves the queue manager name to use.  Resolved from
+// either an environment variable, or the hostname.
+func GetQueueManagerName() (string, error) {
+	var name string
+	var err error
+	name, ok := os.LookupEnv("MQ_QMGR_NAME")
+	if !ok || name == "" {
+		name, err = os.Hostname()
+		if err != nil {
+			return "", err
+		}
+		name = sanitizeQueueManagerName(name)
+	}
+	// TODO: What if the specified env variable is an invalid name?
+	return name, nil
+}

pkg/name/name_test.go

@@ -0,0 +1,56 @@
+/*
+© Copyright IBM Corporation 2017, 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package name
+
+import (
+	"os"
+	"testing"
+)
+
+var sanitizeTests = []struct {
+	in  string
+	out string
+}{
+	{"foo", "foo"},
+	{"foo-0", "foo0"},
+	{"foo-", "foo"},
+	{"-foo", "foo"},
+	{"foo_0", "foo_0"},
+}
+
+func TestSanitizeQueueManagerName(t *testing.T) {
+	for _, table := range sanitizeTests {
+		s := sanitizeQueueManagerName(table.in)
+		if s != table.out {
+			t.Errorf("sanitizeQueueManagerName(%v) - expected %v, got %v", table.in, table.out, s)
+		}
+	}
+}
+
+func TestGetQueueManagerNameFromEnv(t *testing.T) {
+	const data string = "foo"
+	err := os.Setenv("MQ_QMGR_NAME", data)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+	n, err := GetQueueManagerName()
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+	if n != data {
+		t.Errorf("Expected name=%v, got name=%v", data, n)
+	}
+}