Merge pull request #314 from galasa-dev/ash-cps-property

CPS property name now accepts @ symbol

Author: techcobweb

pkg/errors/errorMessage.go

@@ -231,7 +231,7 @@ var (
 		"The namespace must start with a character in the 'a-z' range, followed by characters in the 'a'-'z' or '0'-'9' ranges only.", 1140, STACK_TRACE_NOT_WANTED)
 	GALASA_ERROR_FAILED_TO_COMPILE_PROPERTY_FIELD_REGEX = NewMessageType("GAL1141E: Unable to compile the regex pattern for Galasa Property field '%s'. Reason: '%s'", 1141, STACK_TRACE_NOT_WANTED)
 	GALASA_ERROR_INVALID_PROPERTY_FIELD_FORMAT          = NewMessageType("GAL1142E: The %s field value, '%s', provided does not match formatting requirements. "+
-		"The %s field value must start with a character in the 'a-z' or 'A-Z' range, followed by any characters in the 'a'-'z', 'A'-'Z', '0'-'9', '.' (period), '-' (dash) or '_' (underscore) ranges only.", 1142, STACK_TRACE_NOT_WANTED)
+		"The %s field value must start with a character in the 'a-z' or 'A-Z' range, followed by any characters in the 'a'-'z', 'A'-'Z', '0'-'9', '.' (period), '-' (dash) or '_' (underscore) or '@' (at) ranges only.", 1142, STACK_TRACE_NOT_WANTED)
 	GALASA_ERROR_QUERY_RUNS_NON_OK_STATUS              = NewMessageType("GAL1143E: Could not query run results. Server returned a non-200 code (%s)", 1143, STACK_TRACE_NOT_WANTED)
 	GALASA_ERROR_GET_TEST_CATALOG_CONTENTS_FAILED      = NewMessageType("GAL1144E: Could not use url '%s' to retrieve the contents of the test catalog from stream '%s'. Http error from the Galasa server is '%v'", 1144, STACK_TRACE_NOT_WANTED)
 	GALASA_ERROR_FAILED_TO_CREATE_BEARER_TOKEN_FOLDER  = NewMessageType("GAL1145E: Failed to create folder for bearer tokens at '%s'\n", 1145, STACK_TRACE_NOT_WANTED)

pkg/properties/properties.go

@@ -15,7 +15,7 @@ import (
 
 const (
 	PROPERTY_NAMESPACE_PATTERN = "^[a-z][a-z0-9]+$"
-	PROPERTY_NAME_PATTERN      = "^[a-zA-Z][a-zA-Z0-9\\.\\-\\_]+$"
+	PROPERTY_NAME_PATTERN      = "^[a-zA-Z][a-zA-Z0-9\\.\\-\\_@]+$"
 )
 
 func validateInputsAreNotEmpty(namespace string, name string) error {

pkg/properties/propertiesDelete_test.go

@@ -85,6 +85,22 @@ func TestDeletePropertyValueReturnsOk(t *testing.T) {
 	assert.Nil(t, err)
 }
 
+func TestDeletePropertyValueWithAtSymbolReturnsOk(t *testing.T) {
+	//Given...
+	namespace := "validnamespace"
+	name := "Galasadelivery@ibm.com"
+
+	server := newDeletePropertiesServletMock(t)
+	apiClient := api.InitialiseAPI(server.URL)
+	defer server.Close()
+
+	//When
+	err := DeleteProperty(namespace, name, apiClient)
+
+	//Then
+	assert.Nil(t, err)
+}
+
 // invalid OR empty namespace, valid propertyname
 func TestDeletePropertyWithInvalidNamesapceFormatReturnsError(t *testing.T) {
 	//Given...

pkg/properties/propertiesSet_test.go

@@ -105,6 +105,25 @@ func TestCreatePropertyWithValidNamespaceReturnsOk(t *testing.T) {
 	assert.Nil(t, err)
 }
 
+func TestCreatePropertyWithValidNamespaceWithAtSymbolReturnsOk(t *testing.T) {
+	//Given...
+	namespace := "validnamespace"
+	name := "Galasadelivery@ibm.com"
+	value := "someValue"
+
+	server := newSetPropertiesServletMock(t)
+	apiServerUrl := server.URL
+	defer server.Close()
+
+	apiClient := api.InitialiseAPI(apiServerUrl)
+
+	//When
+	err := SetProperty(namespace, name, value, apiClient)
+
+	//Then
+	assert.Nil(t, err)
+}
+
 func TestUpdatePropertyWithInvalidNamespaceAndInvalidPropertyNameReturnsError(t *testing.T) {
 	//Given...
 	namespace := "invalidnamespace"
@@ -146,6 +165,25 @@ func TestUpdatePropertyWithValidNamespaceAndVaidNameValueReturnsOk(t *testing.T)
 	assert.Nil(t, err)
 }
 
+func TestUpdatePropertyWithValidNamespaceAndVaidNameValueWithAtSymbolReturnsOk(t *testing.T) {
+	//Given...
+	namespace := "validnamespace"
+	name := "Galasadelivery@ibm.com"
+	value := "updatedValue"
+
+	server := newSetPropertiesServletMock(t)
+	apiServerUrl := server.URL
+	defer server.Close()
+
+	apiClient := api.InitialiseAPI(apiServerUrl)
+
+	//When
+	err := SetProperty(namespace, name, value, apiClient)
+
+	//Then
+	assert.Nil(t, err)
+}
+
 func TestUpdatePropertyWithInvalidNamespaceAndValidNameReturnsError(t *testing.T) {
 	//Given...
 	namespace := "invalidnamespace"