combine remove and remove with value

Author: rushmash91

pkg/resource/api_key/hooks.go

@@ -96,7 +96,7 @@ func updateStageKeyPatches(patchSet *patch.Set, latest, desired []*svcapitypes.S
 			key := fmt.Sprintf("%s/%s", *sk.RestAPIID, *sk.StageName)
 			if !desiredMap[key] {
 				encodedKey := strings.Replace(key, "/", "~1", -1)
-				patchSet.Remove(fmt.Sprintf("/stages/%s", encodedKey))
+				patchSet.Remove(fmt.Sprintf("/stages/%s", encodedKey), nil)
 			}
 		}
 	}

pkg/resource/api_method_response/hooks.go

@@ -36,7 +36,7 @@ func updateMethodResponseInput(desired, latest *resource, input *svcsdk.UpdateMe
 		// Handle boolean map patching
 		for k := range latestSpec.ResponseParameters {
 			if _, ok := desiredSpec.ResponseParameters[k]; !ok {
-				patchSet.Remove(fmt.Sprintf("/responseParameters/%s", patchKeyEncoder.Replace(k)))
+				patchSet.Remove(fmt.Sprintf("/responseParameters/%s", patchKeyEncoder.Replace(k)), nil)
 			}
 		}
 		for k, v := range desiredSpec.ResponseParameters {

pkg/resource/authorizer/hooks.go

@@ -101,7 +101,7 @@ func updateProviderARNsPatches(
 	for arn := range latestSet {
 		if !desiredSet[arn] {
 			// Use RemoveWithValue to generate: op=remove, path=/providerARNs, value=arn
-			patchSet.RemoveWithValue("/providerARNs", aws.String(arn))
+			patchSet.Remove("/providerARNs", aws.String(arn))
 		}
 	}
 

pkg/resource/stage/hooks.go

@@ -78,7 +78,7 @@ func updateCanarySettings(delta *compare.Delta, desiredSpec, latestSpec svcapity
 	const rootKey = "/canarySettings"
 	canary := desiredSpec.CanarySettings
 	if canary == nil {
-		patchSet.Remove(rootKey)
+		patchSet.Remove(rootKey, nil)
 		return
 	}
 

pkg/util/patch/patch.go

@@ -87,23 +87,17 @@ func (p *Set) Add(path string, desiredVal *string) {
 }
 
 // Remove adds a patch operation to this set for removing the specified path.
-func (p *Set) Remove(path string) {
-	p.patchOps = append(p.patchOps, &apigatewaytypes.PatchOperation{
+// If valueToRemove is provided (not nil), it adds the value to the operation,
+// generating op=remove, path=<path>, value=<valueToRemove>.
+func (p *Set) Remove(path string, valueToRemove *string) {
+	op := &apigatewaytypes.PatchOperation{
 		Op:   apigatewaytypes.OpRemove,
 		Path: aws.String(path),
-	})
-}
-
-// RemoveWithValue adds a patch operation to this set for removing a specific value
-// from a list identified by the path.
-// This generates op=remove, path=<path>, value=<valueToRemove>.
-// Useful for APIs like API Gateway UpdateAuthorizer for providerARNs.
-func (p *Set) RemoveWithValue(path string, valueToRemove *string) {
-	p.patchOps = append(p.patchOps, &apigatewaytypes.PatchOperation{
-		Op:    apigatewaytypes.OpRemove,
-		Path:  aws.String(path),
-		Value: valueToRemove,
-	})
+	}
+	if valueToRemove != nil {
+		op.Value = valueToRemove
+	}
+	p.patchOps = append(p.patchOps, op)
 }
 
 // GetPatchOperations returns the patch operations applied to this set.

pkg/util/patch/patch_test.go

@@ -30,7 +30,7 @@ func TestPatchOperations(t *testing.T) {
 					"k1": aws.String("v1"),
 					"k3": aws.String("v3"),
 				}, false)
-				patchSet.Remove("/removed")
+				patchSet.Remove("/removed", nil)
 			},
 			expectedPatchOps: []apigatewaytypes.PatchOperation{
 				{
@@ -84,7 +84,7 @@ func TestPatchOperations(t *testing.T) {
 					"k1~":  aws.String("v1~/"),
 					"k3~/": aws.String("v3~/"),
 				}, false)
-				patchSet.Remove("/removed")
+				patchSet.Remove("/removed", nil)
 			},
 			expectedPatchOps: []apigatewaytypes.PatchOperation{
 				{
@@ -138,7 +138,7 @@ func TestPatchOperations(t *testing.T) {
 					"k1": aws.String("v1"),
 					"k3": aws.String("v3"),
 				}, true)
-				patchSet.Remove("/removed")
+				patchSet.Remove("/removed", nil)
 			},
 			expectedPatchOps: []apigatewaytypes.PatchOperation{
 				{

test/e2e/conftest.py

@@ -42,8 +42,4 @@ def k8s_client():
 
 @pytest.fixture(scope='module')
 def apigateway_client():
-    return boto3.client('apigateway')
-
-@pytest.fixture(scope='module')
-def cognito_client():
-    return boto3.client('cognito-idp')
+    return boto3.client('apigateway')

test/e2e/service_bootstrap.py

@@ -4,7 +4,7 @@
 # not use this file except in compliance with the License. A copy of the
 # License is located at
 #
-# http://aws.amazon.com/apache2.0/
+#	 http://aws.amazon.com/apache2.0/
 #
 # or in the "license" file accompanying this file. This file is distributed
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
@@ -13,7 +13,6 @@
 """Bootstraps the resources required to run the API Gateway integration tests.
 """
 import logging
-import os
 
 from acktest.bootstrapping import Resources, BootstrapFailureException