Skip to content

Commit 96d009c

Browse files
authored
fix: remove alpha-documentai.googleapis.com from the list of VPC_SC restricted service (#188)
1 parent c3f7b8f commit 96d009c

File tree

7 files changed

+20
-9
lines changed

7 files changed

+20
-9
lines changed

examples/secure_cloud_function_bigquery_trigger/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resource "random_id" "random_folder_suffix" {
3232

3333
module "secure_harness" {
3434
source = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
35-
version = "~> 0.17.2"
35+
version = "~> 0.21.5"
3636

3737
billing_account = var.billing_account
3838
security_project_name = "prj-scf-security"

examples/secure_cloud_function_internal_server/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ resource "random_id" "random_folder_suffix" {
3333

3434
module "secure_harness" {
3535
source = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
36-
version = "~> 0.17.2"
36+
version = "~> 0.21.5"
3737

3838
billing_account = var.billing_account
3939
security_project_name = "prj-scf-security"

examples/secure_cloud_function_with_sql/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "random_id" "random_folder_suffix" {
3636

3737
module "secure_harness" {
3838
source = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
39-
version = "~> 0.17.2"
39+
version = "~> 0.21.5"
4040

4141
billing_account = var.billing_account
4242
security_project_name = "prj-scf-security"

modules/secure-cloud-function/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
module "cloud_serverless_network" {
1919
source = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-net"
20-
version = "~> 0.17.2"
20+
version = "~> 0.21.5"
2121

2222
connector_name = var.connector_name
2323
subnet_name = var.subnet_name

test/integration/secure_cloud_function_bigquery_trigger/cloud_function2_bigquery_trigger_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ var (
4242
".*Error 403.*Permission.*denied on resource.*": "Permission denied on resource.",
4343

4444
// Editing VPC Service Controls is eventually consistent.
45-
".*Error 403.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
45+
".*Error 403.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
46+
".*Error code 7.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
47+
48+
// Google Storage Service Agent propagation issue.
49+
".*Error 400.*Service account service-.*@gs-project-accounts.iam.gserviceaccount.com does not exist.*": "Google Storage Service Agent propagation issue",
4650
}
4751
)
4852

@@ -96,7 +100,6 @@ func TestGCF2BigqueryTrigger(t *testing.T) {
96100
"adsdatahub.googleapis.com",
97101
"aiplatform.googleapis.com",
98102
"alloydb.googleapis.com",
99-
"alpha-documentai.googleapis.com",
100103
"analyticshub.googleapis.com",
101104
"apigee.googleapis.com",
102105
"apigeeconnect.googleapis.com",
@@ -248,7 +251,7 @@ func TestGCF2BigqueryTrigger(t *testing.T) {
248251

249252
// Network test
250253
opNet := gcloud.Runf(t, "compute networks describe %s --project=%s", networkName, networkProjectID)
251-
assert.Equal("GLOBAL", opNet.Get("routingConfig.routingMode").String(), fmt.Sprint("Routing Mode should be GLOBAL."))
254+
assert.Equal("GLOBAL", opNet.Get("routingConfig.routingMode").String(), "Routing Mode should be GLOBAL.")
252255

253256
// Sub-network test
254257
subnetName := bqt.GetStringOutput("service_vpc_subnet_name")

test/integration/secure_cloud_function_internal_server/cloud_function_internal_server_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ var (
4242
".*Error 403.*Permission.*denied on resource.*": "Permission denied on resource.",
4343

4444
// Editing VPC Service Controls is eventually consistent.
45-
".*Error 403.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
45+
".*Error 403.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
46+
".*Error code 7.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
47+
48+
// Google Storage Service Agent propagation issue.
49+
".*Error 400.*Service account service-.*@gs-project-accounts.iam.gserviceaccount.com does not exist.*": "Google Storage Service Agent propagation issue",
4650
}
4751
)
4852

test/integration/secure_cloud_function_with_sql/secure_cloud_function_with_sql_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ var (
4141
".*Error 403.*Permission.*denied on resource.*": "Permission denied on resource.",
4242

4343
// Editing VPC Service Controls is eventually consistent.
44-
".*Error 403.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
44+
".*Error 403.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
45+
".*Error code 7.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
46+
47+
// Google Storage Service Agent propagation issue.
48+
".*Error 400.*Service account service-.*@gs-project-accounts.iam.gserviceaccount.com does not exist.*": "Google Storage Service Agent propagation issue",
4549
}
4650
)
4751

0 commit comments

Comments
 (0)