Mock AccessContextManager

config/samples/resources/accesscontextmanageraccesslevel/accesscontextmanager_v1beta1_accesscontextmanageraccesslevel.yaml

@@ -17,7 +17,7 @@ kind: AccessContextManagerAccessLevel
 metadata:
   annotations:
     # Replace "${ORG_ID?}" with the numeric ID for your organization
-    cnrm.cloud.google.com/organization-id: "${ORG_ID}"
+    cnrm.cloud.google.com/organization-id: "${ORG_ID?}"
   name: accesslevelsample
 spec:
   accessPolicyRef:

config/samples/resources/accesscontextmanageraccesspolicy/accesscontextmanager_v1beta1_accesscontextmanageraccesspolicy.yaml

@@ -17,7 +17,7 @@ kind: AccessContextManagerAccessPolicy
 metadata:
   annotations:
     # Replace "${ORG_ID?}" with the numeric ID for your organization
-    cnrm.cloud.google.com/organization-id: "${ORG_ID}"
+    cnrm.cloud.google.com/organization-id: "${ORG_ID?}"
   name: accesspolicysample
 spec:
   title: Config Connector Sample

config/samples/resources/accesscontextmanagerserviceperimeter/accesscontextmanager_v1beta1_accesscontextmanageraccesslevel.yaml

@@ -17,7 +17,7 @@ kind: AccessContextManagerAccessLevel
 metadata:
   annotations:
     # Replace "${ORG_ID?}" with the numeric ID for your organization
-    cnrm.cloud.google.com/organization-id: "${ORG_ID}"
+    cnrm.cloud.google.com/organization-id: "${ORG_ID?}"
   name: serviceperimeterdep1
 spec:
   accessPolicyRef:
@@ -34,7 +34,7 @@ kind: AccessContextManagerAccessLevel
 metadata:
   annotations:
     # Replace "${ORG_ID?}" with the numeric ID for your organization
-    cnrm.cloud.google.com/organization-id: "${ORG_ID}"
+    cnrm.cloud.google.com/organization-id: "${ORG_ID?}"
   name: serviceperimeterdep2
 spec:
   accessPolicyRef:

config/samples/resources/accesscontextmanagerserviceperimeter/accesscontextmanager_v1beta1_accesscontextmanagerserviceperimeter.yaml

@@ -42,15 +42,17 @@ spec:
     egressPolicies:
     - egressFrom:
         identities:
-        - name: serviceperimeterengressdep
+          - serviceAccountRef:
+              name: serviceperimeterengressdep
     - egressTo:
         resources:
         - projectRef:
             external: "projects/${PROJECT_NUMBER1}"
     ingressPolicies:
     - ingressFrom:
         identities:
-        - name: serviceperimeteringressdep
+          - serviceAccountRef:
+              name: serviceperimeteringressdep
         sources:
         - accessLevelRef:
             name: serviceperimeterdep2

config/samples/resources/accesscontextmanagerserviceperimeter/iam_v1beta1_iamserviceaccount.yaml

@@ -17,13 +17,13 @@ kind: IAMServiceAccount
 metadata:
   annotations:
     # Replace "${ORG_ID?}" with the numeric ID for your organization
-    cnrm.cloud.google.com/organization-id: "${ORG_ID}"
+    cnrm.cloud.google.com/organization-id: "${ORG_ID?}"
   name: serviceperimeterengressdep
 ---
 apiVersion: iam.cnrm.cloud.google.com/v1beta1
 kind: IAMServiceAccount
 metadata:
   annotations:
     # Replace "${ORG_ID?}" with the numeric ID for your organization
-    cnrm.cloud.google.com/organization-id: "${ORG_ID}"
+    cnrm.cloud.google.com/organization-id: "${ORG_ID?}"
   name: serviceperimeteringressdep

config/tests/samples/create/harness.go

@@ -438,6 +438,10 @@ func MaybeSkip(t *testing.T, name string, resources []*unstructured.Unstructured
 			}
 
 			switch gvk.GroupKind() {
+			case schema.GroupKind{Group: "accesscontextmanager.cnrm.cloud.google.com", Kind: "AccessContextManagerAccessLevel"}:
+			case schema.GroupKind{Group: "accesscontextmanager.cnrm.cloud.google.com", Kind: "AccessContextManagerServicePerimeter"}:
+			case schema.GroupKind{Group: "accesscontextmanager.cnrm.cloud.google.com", Kind: "AccessContextManagerServicePerimeterResource"}:
+
 			case schema.GroupKind{Group: "apikeys.cnrm.cloud.google.com", Kind: "APIKeysKey"}:
 
 			case schema.GroupKind{Group: "cloudfunctions.cnrm.cloud.google.com", Kind: "CloudFunctionsFunction"}:

mockgcp/Makefile

@@ -43,4 +43,5 @@ gen-proto:
 		./third_party/googleapis/mockgcp/cloud/security/privateca/v1/*.proto \
 		./third_party/googleapis/mockgcp/cloud/secretmanager/v1/*.proto \
 		./third_party/googleapis/mockgcp/api/serviceusage/v1/*.proto \
-		./third_party/googleapis/mockgcp/api/serviceusage/v1beta1/*.proto
+		./third_party/googleapis/mockgcp/api/serviceusage/v1beta1/*.proto \
+		./third_party/googleapis/mockgcp/identity/accesscontextmanager/v1/*.proto

mockgcp/fixup-third-party.sh

@@ -26,6 +26,7 @@ rm -rf mockgcp/ && mkdir -p mockgcp/api/
 mv google/cloud/ mockgcp/
 mv google/iam/ mockgcp/
 mv google/storage/ mockgcp/
+mv google/identity/ mockgcp/
 mv google/api/apikeys/ mockgcp/api/
 mv google/api/serviceusage/ mockgcp/api/
 
@@ -41,6 +42,9 @@ find . -type f -print0 | xargs -0 sed -i -e "s@google\[email protected]@g"
 find . -type f -print0 | xargs -0 sed -i -e "s@google/storage/@mockgcp/storage/@g"
 find . -type f -print0 | xargs -0 sed -i -e "s@google\[email protected]@g"
 
+find . -type f -print0 | xargs -0 sed -i -e "s@google/identity/@mockgcp/identity/@g"
+find . -type f -print0 | xargs -0 sed -i -e "s@google\[email protected]@g"
+
 find . -type f -print0 | xargs -0 sed -i -e "s@google/api/apikeys/@mockgcp/api/apikeys/@g"
 find . -type f -print0 | xargs -0 sed -i -e "s@google\.api\[email protected]@g"