Ignore ModifyVpcEndpoint in generator (#16)

brycahta · web-flow · commit 4027a3922279 · 2021-10-19T12:10:22.000-07:00
Issue #, if available: N/A

Description of changes:
* Ignores `ModifyVpcEndpoint` operation for now and back out generated code until there's bandwidth to deep dive and test
* Ignore dry run field in Internet Gateway-- should've been done before
* Minor test refactor: move ec2 client to `conftest` for ez sharing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2021-10-08T20:55:38Z"
-  build_hash: 4b30ff5578e2f570d1c5b1741f3098be0d78e246
+  build_date: "2021-10-18T19:14:45Z"
+  build_hash: 21ee1672e2c1556fd5784a22bc48aa619975cc6f
   go_version: go1.17
   version: v0.15.1
-api_directory_checksum: e860f6435d7aa89d9171eb1e0e42d969a9cd4d84
+api_directory_checksum: 0f150b1176d3ba9246acb726466358f2877b24a8
 api_version: v1alpha1
 aws_sdk_go_version: v1.37.10
 generator_config_info:
-  file_checksum: 45f149e5444111a0e7a0a159b47c1ae38adfb0a6
+  file_checksum: af6d95e7cd2066fe11752abd324daf8e051be09f
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -1,9 +1,12 @@
 ignore:
+  operations:
+    - ModifyVpcEndpoint
   field_paths:
     - CreateVpcEndpointInput.DryRun
     - CreateVpcInput.DryRun
     - CreateSubnetInput.DryRun
     - CreateRouteTableInput.DryRun
+    - CreateInternetGatewayInput.DryRun
   resource_names:
     - AccountAttribute
     - CapacityReservation
diff --git a/apis/v1alpha1/internet_gateway.go b/apis/v1alpha1/internet_gateway.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml b/config/crd/bases/ec2.services.k8s.aws_internetgateways.yaml
@@ -37,12 +37,6 @@ spec:
             description: "InternetGatewaySpec defines the desired state of InternetGateway.
               \n Describes an internet gateway."
             properties:
-              dryRun:
-                description: Checks whether you have the required permissions for
-                  the action, without actually making the request, and provides an
-                  error response. If you have the required permissions, the error
-                  response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-                type: boolean
               tagSpecifications:
                 description: The tags to assign to the internet gateway.
                 items:
diff --git a/generator.yaml b/generator.yaml
@@ -1,9 +1,12 @@
 ignore:
+  operations:
+    - ModifyVpcEndpoint
   field_paths:
     - CreateVpcEndpointInput.DryRun
     - CreateVpcInput.DryRun
     - CreateSubnetInput.DryRun
     - CreateRouteTableInput.DryRun
+    - CreateInternetGatewayInput.DryRun
   resource_names:
     - AccountAttribute
     - CapacityReservation
diff --git a/helm/crds/ec2.services.k8s.aws_internetgateways.yaml b/helm/crds/ec2.services.k8s.aws_internetgateways.yaml
@@ -37,12 +37,6 @@ spec:
             description: "InternetGatewaySpec defines the desired state of InternetGateway.
               \n Describes an internet gateway."
             properties:
-              dryRun:
-                description: Checks whether you have the required permissions for
-                  the action, without actually making the request, and provides an
-                  error response. If you have the required permissions, the error
-                  response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-                type: boolean
               tagSpecifications:
                 description: The tags to assign to the internet gateway.
                 items:
diff --git a/pkg/resource/internet_gateway/delta.go b/pkg/resource/internet_gateway/delta.go
diff --git a/pkg/resource/internet_gateway/sdk.go b/pkg/resource/internet_gateway/sdk.go
diff --git a/pkg/resource/vpc_endpoint/sdk.go b/pkg/resource/vpc_endpoint/sdk.go
diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py
@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+import boto3
 import pytest
 
 def pytest_addoption(parser):
@@ -35,3 +36,8 @@ def pytest_collection_modifyitems(config, items):
     for item in items:
         if "slow" in item.keywords:
             item.add_marker(skip_slow)
+
+
+@pytest.fixture(scope="module")
+def ec2_client():
+    return boto3.client("ec2")
diff --git a/test/e2e/tests/test_internet_gateway.py b/test/e2e/tests/test_internet_gateway.py
@@ -14,7 +14,6 @@
 """Integration tests for the InternetGateway API.
 """
 
-import boto3
 import pytest
 import time
 import logging
@@ -29,10 +28,6 @@
 CREATE_WAIT_AFTER_SECONDS = 10
 DELETE_WAIT_AFTER_SECONDS = 10
 
-@pytest.fixture(scope="module")
-def ec2_client():
-    return boto3.client("ec2")
-
 
 def get_internet_gateway(ec2_client, ig_id: str) -> dict:
     try:
diff --git a/test/e2e/tests/test_route_table.py b/test/e2e/tests/test_route_table.py
@@ -14,7 +14,6 @@
 """Integration tests for the RouteTable API.
 """
 
-import boto3
 import pytest
 import time
 import logging
@@ -30,11 +29,6 @@
 CREATE_WAIT_AFTER_SECONDS = 10
 DELETE_WAIT_AFTER_SECONDS = 10
 
-@pytest.fixture(scope="module")
-def ec2_client():
-    return boto3.client("ec2")
-
-
 def get_route_table(ec2_client, route_table_id: str) -> dict:
     try:
         resp = ec2_client.describe_route_tables(
diff --git a/test/e2e/tests/test_subnet.py b/test/e2e/tests/test_subnet.py
@@ -14,7 +14,6 @@
 """Integration tests for the Subnet API.
 """
 
-import boto3
 import pytest
 import time
 import logging
@@ -30,10 +29,6 @@
 CREATE_WAIT_AFTER_SECONDS = 10
 DELETE_WAIT_AFTER_SECONDS = 10
 
-@pytest.fixture(scope="module")
-def ec2_client():
-    return boto3.client("ec2")
-
 
 def get_subnet(ec2_client, subnet_id: str) -> dict:
     try:
diff --git a/test/e2e/tests/test_vpc.py b/test/e2e/tests/test_vpc.py
@@ -14,7 +14,6 @@
 """Integration tests for the Vpc API.
 """
 
-import boto3
 import pytest
 import time
 import logging
@@ -29,10 +28,6 @@
 CREATE_WAIT_AFTER_SECONDS = 10
 DELETE_WAIT_AFTER_SECONDS = 10
 
-@pytest.fixture(scope="module")
-def ec2_client():
-    return boto3.client("ec2")
-
 
 def get_vpc(ec2_client, vpc_id: str) -> dict:
     try:
diff --git a/test/e2e/tests/test_vpc_endpoint.py b/test/e2e/tests/test_vpc_endpoint.py
@@ -14,7 +14,6 @@
 """Integration tests for the Vpc Endpoint API.
 """
 
-import boto3
 import pytest
 import time
 import logging
@@ -31,10 +30,6 @@
 CREATE_WAIT_AFTER_SECONDS = 10
 DELETE_WAIT_AFTER_SECONDS = 10
 
-@pytest.fixture(scope="module")
-def ec2_client():
-    return boto3.client("ec2")
-
 
 def get_vpc_endpoint(ec2_client, vpc_endpoint_id: str) -> dict:
     try:
