Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move certificate id to status for ComputeManagedSSLCert #900

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Move certificate id to status for ComputeManagedSSLCert #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...customresourcedefinition_computemanagedsslcertificates.compute.cnrm.cloud.google.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ spec:
type: object
spec:
properties:
certificateId:
description: The unique identifier for the resource.
type: integer
description:
description: Immutable. An optional description of this resource.
type: string
Expand Down Expand Up @@ -121,6 +118,9 @@ spec:
type: object
status:
properties:
certificateId:
description: The unique identifier for the resource.
type: integer
conditions:
description: Conditions represent the latest available observation
of the resource's current state.
Expand Down
12 changes: 12 additions & 0 deletions hack/terraform-overrides/compute_managed_ssl_certificate.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute/resource_compute_managed_ssl_certificate.go b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute/resource_compute_managed_ssl_certificate.go
index 4a722566d..6aeaa228e 100644
--- a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute/resource_compute_managed_ssl_certificate.go
+++ b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute/resource_compute_managed_ssl_certificate.go
@@ -103,7 +103,6 @@ which type this is. Default value: "MANAGED" Possible values: ["MANAGED"]`,
"certificate_id": {
Type: schema.TypeInt,
Computed: true,
- Optional: true,
Description: `The unique identifier for the resource.`,
},
"creation_timestamp": {
8 changes: 4 additions & 4 deletions pkg/clients/generated/apis/compute/v1alpha1/computemanagedsslcertificate_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions pkg/clients/generated/apis/compute/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions third_party/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,5 @@ apply-patches:
git apply ../hack/terraform-overrides/compute_instance_from_template_params_field.patch
# Correct the field type of terminal_condition field. b/296456403.
git apply ../hack/terraform-overrides/runservice_terminalcondition.patch
# Mark certificate id as readonly
git apply ../hack/terraform-overrides/compute_managed_ssl_certificate.patch
1 change: 0 additions & 1 deletion ...ider-google-beta/google-beta/services/compute/resource_compute_managed_ssl_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ which type this is. Default value: "MANAGED" Possible values: ["MANAGED"]`,
"certificate_id": {
Type: schema.TypeInt,
Computed: true,
Optional: true,
Description: `The unique identifier for the resource.`,
},
"creation_timestamp": {
Expand Down