Merge pull request #145 from akamai/release/v2.9.1

Release/v2.9.1 (Feb. 7, 2022)

CHANGELOG.md

@@ -1,5 +1,17 @@
 # EDGEGRID GOLANG RELEASE NOTES
 
+## 2.9.1 (Feb. 7, 2022)
+
+#### FEATURES/ENHANCEMENTS:
+
+* APPSEC
+  * Remove deprecation notes for individual policy protection methods
+
+#### BUG FIXES:
+
+* CLOUDLETS
+  * Fixed validation for ALB version DataCenter percent
+
 ## 2.9.0 (Jan. 24, 2022)
 
 #### FEATURES/ENHANCEMENTS:

pkg/appsec/api_constraints_protection.go

@@ -12,8 +12,6 @@ type (
 	// The APIConstraintsProtection interface supports retrieving and updating API request constraints
 	// for a configuration and policy.
 	//
-	// Deprecated: this interface will be removed in a future release. Use the PolicyProtections interface instead.
-	//
 	// https://developer.akamai.com/api/cloud_security/application_security/v1.html#protections
 	APIConstraintsProtection interface {
 		// https://developer.akamai.com/api/cloud_security/application_security/v1.html#getapirequestconstraints

pkg/appsec/ip_geo_protection.go

@@ -12,8 +12,6 @@ type (
 	// The IPGeoProtection interface supports retrieving and modifying the protections for a policy,
 	// and whether each is enabled or disabled.
 	//
-	// Deprecated: this interface will be removed in a future release. Use the PolicyProtections interface instead.
-	//
 	// https://developer.akamai.com/api/cloud_security/application_security/v1.html#protections
 	IPGeoProtection interface {
 		// https://developer.akamai.com/api/cloud_security/application_security/v1.html#getprotections
@@ -64,7 +62,15 @@ type (
 		ApplySlowPostControls         bool `json:"applySlowPostControls,omitempty"`
 	}
 
-	// UpdateIPGeoProtectionResponse is used to modify the IPGeo protection settings.
+	// UpdateIPGeoProtectionRequest is used to modify the IPGeo protection settings.
+	UpdateIPGeoProtectionRequest struct {
+		ConfigID                  int    `json:"-"`
+		Version                   int    `json:"-"`
+		PolicyID                  string `json:"-"`
+		ApplyNetworkLayerControls bool   `json:"applyNetworkLayerControls"`
+	}
+
+	// UpdateIPGeoProtectionResponse is returned from a call to UpdateIPGeoProtection.
 	UpdateIPGeoProtectionResponse struct {
 		ApplyAPIConstraints           bool `json:"applyApiConstraints"`
 		ApplyApplicationLayerControls bool `json:"applyApplicationLayerControls"`
@@ -74,14 +80,6 @@ type (
 		ApplyReputationControls       bool `json:"applyReputationControls"`
 		ApplySlowPostControls         bool `json:"applySlowPostControls"`
 	}
-
-	// UpdateIPGeoProtectionRequest is returned from a call to UpdateIPGeoProtection.
-	UpdateIPGeoProtectionRequest struct {
-		ConfigID                  int    `json:"-"`
-		Version                   int    `json:"-"`
-		PolicyID                  string `json:"-"`
-		ApplyNetworkLayerControls bool   `json:"applyNetworkLayerControls"`
-	}
 )
 
 // Validate validates a GetIPGeoProtectionRequest.

pkg/appsec/network_layer_protection.go

@@ -11,8 +11,6 @@ import (
 type (
 	// The NetworkLayerProtection interface supports retrieving, modifying and removing network layer protection.
 	//
-	// Deprecated: this interface will be removed in a future release. Use the PolicyProtections interface instead.
-	//
 	// https://developer.akamai.com/api/cloud_security/application_security/v1.html#protections
 	NetworkLayerProtection interface {
 		// https://developer.akamai.com/api/cloud_security/application_security/v1.html#getprotections

pkg/appsec/reputation_protection.go

@@ -12,8 +12,6 @@ type (
 	// The ReputationProtection interface supports retrieving, modifying and removing reputation
 	// protection.
 	//
-	// Deprecated: this interface will be removed in a future release. Use the PolicyProtections interface instead.
-	//
 	// https://developer.akamai.com/api/cloud_security/application_security/v1.html#protections
 	ReputationProtection interface {
 		// https://developer.akamai.com/api/cloud_security/application_security/v1.html#getprotections

pkg/appsec/slowpost_protection.go

@@ -12,8 +12,6 @@ type (
 	// The SlowPostProtection interface supports retrieving and updating slow post protection
 	// for a configuration and policy.
 	//
-	// Deprecated: this interface will be removed in a future release. Use the PolicyProtections interface instead.
-	//
 	// https://developer.akamai.com/api/cloud_security/application_security/v1.html#slowpostprotection
 	SlowPostProtection interface {
 		// https://developer.akamai.com/api/cloud_security/application_security/v1.html#getprotections

pkg/appsec/waf_protection.go

@@ -12,8 +12,6 @@ type (
 	// The WAFProtection interface supports retrieving, modifying and removing protections for a
 	// security policy.
 	//
-	// Deprecated: this interface will be removed in a future release. Use the PolicyProtections interface instead.
-	//
 	// https://developer.akamai.com/api/cloud_security/application_security/v1.html#protections
 	WAFProtection interface {
 		// https://developer.akamai.com/api/cloud_security/application_security/v1.html#getprotections

pkg/cloudlets/loadbalancer_version.go

@@ -46,11 +46,11 @@ type (
 		Continent                     string   `json:"continent"`
 		Country                       string   `json:"country"`
 		Hostname                      string   `json:"hostname,omitempty"`
-		Latitude                      float64  `json:"latitude"`
+		Latitude                      *float64 `json:"latitude"`
 		LivenessHosts                 []string `json:"livenessHosts,omitempty"`
-		Longitude                     float64  `json:"longitude"`
+		Longitude                     *float64 `json:"longitude"`
 		OriginID                      string   `json:"originId"`
-		Percent                       float64  `json:"percent"`
+		Percent                       *float64 `json:"percent"`
 		StateOrProvince               *string  `json:"stateOrProvince,omitempty"`
 	}
 
@@ -143,11 +143,11 @@ func (v DataCenter) Validate() error {
 			fmt.Sprintf("value '%s' is invalid. Must be one of: 'AF', 'AS', 'EU', 'NA', 'OC', 'OT' or 'SA'", (&v).Continent))),
 		"Country":       validation.Validate(v.Country, validation.Required, validation.Length(2, 2)),
 		"Hostname":      validation.Validate(v.Hostname, validation.Length(0, 256)),
-		"Latitude":      validation.Validate(v.Latitude, validation.Required, validation.Min(-180.0), validation.Max(180.0)),
-		"LivenessHosts": validation.Validate(v.LivenessHosts, validation.Length(1, 0)), // max is 0, it means there is no upper bound for the length
-		"Longitude":     validation.Validate(v.Longitude, validation.Required, validation.Min(-180.0), validation.Max(180.0)),
+		"Latitude":      validation.Validate(v.Latitude, validation.NotNil, validation.Min(-180.0), validation.Max(180.0)),
+		"LivenessHosts": validation.Validate(v.LivenessHosts, validation.Required, validation.Length(1, 0)), // max is 0, it means there is no upper bound for the length
+		"Longitude":     validation.Validate(v.Longitude, validation.NotNil, validation.Min(-180.0), validation.Max(180.0)),
 		"OriginID":      validation.Validate(v.OriginID, validation.Required, validation.Length(1, 128)),
-		"Percent":       validation.Validate(v.Percent, validation.Required, validation.Min(0.0), validation.Max(100.0)),
+		"Percent":       validation.Validate(v.Percent, validation.NotNil, validation.Min(0.0), validation.Max(100.0)),
 	}.Filter()
 }
 

pkg/cloudlets/loadbalancer_version_test.go

@@ -9,6 +9,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v2/pkg/cloudlets/tools"
 	validation "github.com/go-ozzo/ozzo-validation/v4"
 
 	"github.com/stretchr/testify/require"
@@ -35,12 +36,12 @@ func TestCreateLoadBalancerVersion(t *testing.T) {
 							LivenessHosts: []string{
 								"clorigin3.www.example.com",
 							},
-							Latitude:  102.78108,
-							Longitude: -116.07064,
+							Latitude:  tools.Float64Ptr(102.78108),
+							Longitude: tools.Float64Ptr(-116.07064),
 							Continent: "NA",
 							Country:   "US",
 							OriginID:  "clorigin3",
-							Percent:   100.0,
+							Percent:   tools.Float64Ptr(100.0),
 						},
 					},
 					Deleted:     false,
@@ -122,12 +123,12 @@ func TestCreateLoadBalancerVersion(t *testing.T) {
 						LivenessHosts: []string{
 							"clorigin3.www.example.com",
 						},
-						Latitude:  102.78108,
-						Longitude: -116.07064,
+						Latitude:  tools.Float64Ptr(102.78108),
+						Longitude: tools.Float64Ptr(-116.07064),
 						Continent: "NA",
 						Country:   "US",
 						OriginID:  "clorigin3",
-						Percent:   100.0,
+						Percent:   tools.Float64Ptr(100.0),
 					},
 				},
 				Deleted:          false,
@@ -264,6 +265,68 @@ func TestCreateLoadBalancerVersion(t *testing.T) {
 	}
 }
 
+func TestDataCenterValidate(t *testing.T) {
+	tests := map[string]struct {
+		DataCenter
+		withError error
+	}{
+		"valid data center": {
+			DataCenter: DataCenter{
+				CloudService: false,
+				Hostname:     "clorigin.example.com",
+				LivenessHosts: []string{
+					"clorigin3.www.example.com",
+				},
+				Latitude:  tools.Float64Ptr(102.78108),
+				Longitude: tools.Float64Ptr(-116.07064),
+				Continent: "NA",
+				Country:   "US",
+				OriginID:  "clorigin3",
+				Percent:   tools.Float64Ptr(100.0),
+			},
+		},
+		"longitude, latitude and percent can be 0": {
+			DataCenter: DataCenter{
+				CloudService: false,
+				Hostname:     "clorigin.example.com",
+				LivenessHosts: []string{
+					"clorigin3.www.example.com",
+				},
+				Latitude:  tools.Float64Ptr(0),
+				Longitude: tools.Float64Ptr(0),
+				Continent: "NA",
+				Country:   "US",
+				OriginID:  "clorigin3",
+				Percent:   tools.Float64Ptr(0),
+			},
+		},
+		"missing all required parameters error": {
+			DataCenter: DataCenter{},
+			withError: validation.Errors{
+				"Continent":     validation.ErrRequired,
+				"Country":       validation.ErrRequired,
+				"Latitude":      validation.ErrNotNilRequired,
+				"LivenessHosts": validation.ErrRequired,
+				"Longitude":     validation.ErrNotNilRequired,
+				"OriginID":      validation.ErrRequired,
+				"Percent":       validation.ErrNotNilRequired,
+			},
+		},
+	}
+
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			err := test.DataCenter.Validate()
+			if test.withError != nil {
+				require.Error(t, err)
+				assert.Equal(t, test.withError.Error(), err.Error(), "want: %s; got %s", test.withError, err)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
+
 func TestLivenessSettingsValidate(t *testing.T) {
 	tests := map[string]struct {
 		LivenessSettings *LivenessSettings
@@ -366,12 +429,12 @@ func TestGetLoadBalancerVersion(t *testing.T) {
 						LivenessHosts: []string{
 							"clorigin3.www.example.com",
 						},
-						Latitude:  102.78108,
-						Longitude: -116.07064,
+						Latitude:  tools.Float64Ptr(102.78108),
+						Longitude: tools.Float64Ptr(-116.07064),
 						Continent: "NA",
 						Country:   "US",
 						OriginID:  "clorigin3",
-						Percent:   100.0,
+						Percent:   tools.Float64Ptr(100.0),
 					},
 				},
 				Deleted:          false,
@@ -461,12 +524,12 @@ func TestUpdateLoadBalancerVersion(t *testing.T) {
 							LivenessHosts: []string{
 								"clorigin3.www.example.com",
 							},
-							Latitude:  102.78108,
-							Longitude: -116.07064,
+							Latitude:  tools.Float64Ptr(102.78108),
+							Longitude: tools.Float64Ptr(-116.07064),
 							Continent: "NA",
 							Country:   "US",
 							OriginID:  "clorigin3",
-							Percent:   100.0,
+							Percent:   tools.Float64Ptr(100.0),
 						},
 					},
 					Deleted:     false,
@@ -539,12 +602,12 @@ func TestUpdateLoadBalancerVersion(t *testing.T) {
 						LivenessHosts: []string{
 							"clorigin3.www.example.com",
 						},
-						Latitude:  102.78108,
-						Longitude: -116.07064,
+						Latitude:  tools.Float64Ptr(102.78108),
+						Longitude: tools.Float64Ptr(-116.07064),
 						Continent: "NA",
 						Country:   "US",
 						OriginID:  "clorigin3",
-						Percent:   100.0,
+						Percent:   tools.Float64Ptr(100.0),
 					},
 				},
 				Deleted:          false,
@@ -579,12 +642,12 @@ func TestUpdateLoadBalancerVersion(t *testing.T) {
 							LivenessHosts: []string{
 								"clorigin3.www.example.com",
 							},
-							Latitude:  102.78108,
-							Longitude: -116.07064,
+							Latitude:  tools.Float64Ptr(102.78108),
+							Longitude: tools.Float64Ptr(-116.07064),
 							Continent: "NA",
 							Country:   "US",
 							OriginID:  "clorigin3",
-							Percent:   100.0,
+							Percent:   tools.Float64Ptr(100.0),
 						},
 					},
 					Description: "Test load balancing configuration.",
@@ -739,12 +802,12 @@ func TestListLoadBalancerVersions(t *testing.T) {
 							LivenessHosts: []string{
 								"clorigin3.www.example.com",
 							},
-							Latitude:  102.78108,
-							Longitude: -116.07064,
+							Latitude:  tools.Float64Ptr(102.78108),
+							Longitude: tools.Float64Ptr(-116.07064),
 							Continent: "NA",
 							Country:   "US",
 							OriginID:  "clorigin3",
-							Percent:   100.0,
+							Percent:   tools.Float64Ptr(100.0),
 						},
 					},
 					Deleted:          false,
@@ -770,12 +833,12 @@ func TestListLoadBalancerVersions(t *testing.T) {
 							LivenessHosts: []string{
 								"clorigin3.www.example.com",
 							},
-							Latitude:  102.78108,
-							Longitude: -116.07064,
+							Latitude:  tools.Float64Ptr(102.78108),
+							Longitude: tools.Float64Ptr(-116.07064),
 							Continent: "NA",
 							Country:   "US",
 							OriginID:  "clorigin3",
-							Percent:   100.0,
+							Percent:   tools.Float64Ptr(100.0),
 						},
 					},
 					Deleted:          false,