DXE-1225 Merge pull request #157 from akamai/release/v1.2.0

akamai · Jul 4, 2022 · 7f6c610 · 7f6c610
2 parents 8183bd0 + d415486
commit 7f6c610
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # EDGEGRID GOLANG RELEASE NOTES
 
+## 1.2.0 (Jul 04, 2022)
+
+#### FEATURES/ENHANCEMENTS:
+* Added GTM API v1.5 support
+
 ## 1.1.1 (May 11, 2021)
 
 #### BUG FIXES

diff --git a/Makefile b/Makefile
@@ -0,0 +1,6 @@
+.PHONY: all
+all: test
+
+.PHONY: test
+test: ; $(info > Running tests...) @
+	go test -v  ./...
diff --git a/configgtm-v1_5/property_test.go b/configgtm-v1_5/property_test.go
@@ -344,7 +344,7 @@ func TestCreateProperty(t *testing.T) {
 	testProperty.HandoutMode = "normal"
 	testProperty.FailoverDelay = 0
 	testProperty.FailbackDelay = 0
-	testProperty.TrafficTargets = []*TrafficTarget{&TrafficTarget{DatacenterId: 3131, Enabled: true, Servers: []string{"1.2.3.4"}, Weight: 100.0}}
+	testProperty.TrafficTargets = []*TrafficTarget{{DatacenterId: 3131, Enabled: true, Servers: []string{"1.2.3.4"}, Weight: 100.0}}
 
 	statresp, err := testProperty.Create(gtmTestDomain)
 	assert.NoError(t, err)
@@ -380,7 +380,7 @@ func TestUpdateProperty(t *testing.T) {
                         "healthMultiplier" : null,
                         "healthThreshold" : null,
                         "lastModified" : "2019-06-14T19:46:17.818+00:00",
-                        livenessTests" : [  {
+                        "livenessTests" : [  {
                             "name": "liveness-1",
                             "peerCertificateVerification": false,
                             "testInterval": 30,

diff --git a/scripts/semtag b/scripts/semtag
@@ -589,6 +589,7 @@ case $ACTION in
     if [ "$forcetag" == "false" ]; then
       if  [ -n "$diff_dev" ] && [ -n "$diff" ] && [ -n "$diff_v2" ]; then
         echo "ERROR: Branch must be updated with develop, master, or v2 for final versions"
+      fi
       if [ -n "$diff" ]; then
         echo "ERROR: Branch must be updated with master for final versions"
         exit 1