add http get port (GoogleCloudPlatform#7764)

maphad · Apr 27, 2023 · baca546 · baca546
1 parent def64ea
commit baca546
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/mmv1/products/cloudrun/Service.yaml b/mmv1/products/cloudrun/Service.yaml
@@ -566,6 +566,7 @@ properties:
                               name: port
                               description: |-
                                 Port number to access on the container. Number must be in the range 1 to 65535.
+                                If not specified, defaults to the same value as container.ports[0].containerPort.
                               default_from_api: true
                         - !ruby/object:Api::Type::NestedObject
                           name: httpGet
@@ -583,6 +584,12 @@ properties:
                               description: |-
                                 Path to access on the HTTP server. If set, it should not be empty string.
                               default_value: "/"
+                            - !ruby/object:Api::Type::Integer
+                              name: port
+                              description: |-
+                                Port number to access on the container. Number must be in the range 1 to 65535.
+                                If not specified, defaults to the same value as container.ports[0].containerPort.
+                              default_from_api: true
                             - !ruby/object:Api::Type::Array
                               name: httpHeaders
                               description: |-
@@ -615,6 +622,7 @@ properties:
                               name: port
                               description: |-
                                 Port number to access on the container. Number must be in the range 1 to 65535.
+                                If not specified, defaults to the same value as container.ports[0].containerPort.
                               default_from_api: true
                             - !ruby/object:Api::Type::String
                               name: service
@@ -669,6 +677,12 @@ properties:
                               description: |-
                                 Path to access on the HTTP server. If set, it should not be empty string.
                               default_value: "/"
+                            - !ruby/object:Api::Type::Integer
+                              name: port
+                              description: |-
+                                Port number to access on the container. Number must be in the range 1 to 65535.
+                                If not specified, defaults to the same value as container.ports[0].containerPort.
+                              default_from_api: true
                             - !ruby/object:Api::Type::Array
                               name: httpHeaders
                               description: |-
@@ -700,6 +714,7 @@ properties:
                               name: port
                               description: |-
                                 Port number to access on the container. Number must be in the range 1 to 65535.
+                                If not specified, defaults to the same value as container.ports[0].containerPort.
                               default_from_api: true
                             - !ruby/object:Api::Type::String
                               name: service

diff --git a/mmv1/products/cloudrunv2/Service.yaml b/mmv1/products/cloudrunv2/Service.yaml
@@ -395,6 +395,12 @@ properties:
                       default_value: "/"
                       description: |-
                         Path to access on the HTTP server. Defaults to '/'.
+                    - !ruby/object:Api::Type::Integer
+                      name: port
+                      description: |-
+                        Port number to access on the container. Number must be in the range 1 to 65535.
+                        If not specified, defaults to the same value as container.ports[0].containerPort.
+                      default_from_api: true
                     - !ruby/object:Api::Type::Array
                       name: "httpHeaders"
                       description: |-
@@ -436,7 +442,8 @@ properties:
                     - !ruby/object:Api::Type::Integer
                       name: port
                       description: |-
-                        Port number to access on the container. Number must be in the range 1 to 65535. If not specified, defaults to the same value as container.ports[0].containerPort.
+                        Port number to access on the container. Number must be in the range 1 to 65535.
+                        If not specified, defaults to the same value as container.ports[0].containerPort.
                       default_from_api: true
                     - !ruby/object:Api::Type::String
                       name: service
@@ -486,6 +493,12 @@ properties:
                       default_value: "/"
                       description: |-
                         Path to access on the HTTP server. Defaults to '/'.
+                    - !ruby/object:Api::Type::Integer
+                      name: port
+                      description: |-
+                        Port number to access on the container. Must be in the range 1 to 65535.
+                        If not specified, defaults to the same value as container.ports[0].containerPort.
+                      default_from_api: true
                     - !ruby/object:Api::Type::Array
                       name: "httpHeaders"
                       description: |-
@@ -517,7 +530,8 @@ properties:
                     - !ruby/object:Api::Type::Integer
                       name: port
                       description: |-
-                        Port number to access on the container. Must be in the range 1 to 65535. If not specified, defaults to 8080.
+                        Port number to access on the container. Must be in the range 1 to 65535.
+                        If not specified, defaults to the same value as container.ports[0].containerPort.
                       default_from_api: true
                 - !ruby/object:Api::Type::NestedObject
                   name: grpc
@@ -533,7 +547,8 @@ properties:
                     - !ruby/object:Api::Type::Integer
                       name: port
                       description: |-
-                        Port number to access on the container. Number must be in the range 1 to 65535. If not specified, defaults to the same value as container.ports[0].containerPort.
+                        Port number to access on the container. Number must be in the range 1 to 65535.
+                        If not specified, defaults to the same value as container.ports[0].containerPort.
                       default_from_api: true
                     - !ruby/object:Api::Type::String
                       name: service

diff --git a/mmv1/templates/terraform/examples/cloud_run_service_probes.tf.erb b/mmv1/templates/terraform/examples/cloud_run_service_probes.tf.erb
@@ -3,11 +3,6 @@ resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
 
   name     = "<%= ctx[:vars]['cloud_run_service_name'] %>"
   location = "us-central1"
-  metadata {
-    annotations = {
-      "run.googleapis.com/launch-stage" = "BETA"
-    }
-  }
 
   template {
     spec {

diff --git a/mmv1/third_party/terraform/tests/resource_cloud_run_service_test.go.erb b/mmv1/third_party/terraform/tests/resource_cloud_run_service_test.go.erb
@@ -440,7 +440,6 @@ resource "google_cloud_run_service" "default" {
     namespace = "%s"
     annotations = {
       generated-by = "magic-modules"
-      "run.googleapis.com/launch-stage" = "BETA"
     }
   }
 
@@ -480,7 +479,6 @@ resource "google_cloud_run_service" "default" {
     namespace = "%s"
     annotations = {
       generated-by = "magic-modules"
-      "run.googleapis.com/launch-stage" = "BETA"
     }
   }
 
@@ -507,6 +505,7 @@ resource "google_cloud_run_service" "default" {
           failure_threshold = %s
           http_get {
             path = "/some-path"
+            port = 8080
             http_headers {
               name = "User-Agent"
               value = "magic-modules"
@@ -539,7 +538,6 @@ resource "google_cloud_run_service" "default" {
     namespace = "%s"
     annotations = {
       generated-by = "magic-modules"
-      "run.googleapis.com/launch-stage" = "BETA"
     }
   }
 
@@ -573,7 +571,6 @@ resource "google_cloud_run_service" "default" {
     namespace = "%s"
     annotations = {
       generated-by = "magic-modules"
-      "run.googleapis.com/launch-stage" = "BETA"
     }
   }
 
@@ -584,6 +581,7 @@ resource "google_cloud_run_service" "default" {
         startup_probe {
           http_get {
             path = "/some-path"
+            port = 8080
             http_headers {
               name = "User-Agent"
               value = "magic-modules"
@@ -616,7 +614,6 @@ resource "google_cloud_run_service" "default" {
     namespace = "%s"
     annotations = {
       generated-by = "magic-modules"
-      "run.googleapis.com/launch-stage" = "BETA"
     }
   }
 
@@ -650,7 +647,6 @@ resource "google_cloud_run_service" "default" {
     namespace = "%s"
     annotations = {
       generated-by = "magic-modules"
-      "run.googleapis.com/launch-stage" = "BETA"
     }
   }
 

diff --git a/mmv1/third_party/terraform/tests/resource_cloud_run_v2_service_test.go b/mmv1/third_party/terraform/tests/resource_cloud_run_v2_service_test.go
@@ -399,6 +399,7 @@ resource "google_cloud_run_v2_service" "default" {
         failure_threshold = 2
         http_get {
           path = "/some-path"
+          port = 8080
           http_headers {
             name = "User-Agent"
             value = "magic-modules"
@@ -448,6 +449,7 @@ resource "google_cloud_run_v2_service" "default" {
         failure_threshold = 3
         http_get {
           path = "/some-path"
+          port = 8080
           http_headers {
             name = "User-Agent"
             value = "magic-modules"