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

chore: Enable more SecretManagerSecret fields #3052

Merged
merged 2 commits into from
Nov 1, 2024
Merged

chore: Enable more SecretManagerSecret fields #3052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6caf10
record real gcp
yuwenma Oct 31, 2024
6df335a
compare mock
yuwenma Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ger/v1beta1/fullsecretmanagersecret/_generated_object_fullsecretmanagersecret.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ spec:
foo: secretmanagersecret
expireTime: "2025-10-03T15:01:23Z"
replication:
auto:
customerManagedEncryption:
kmsKeyRef:
name: kmscryptokey-${uniqueId}
automatic: true
rotation:
nextRotationTime: "2025-10-03T15:01:23Z"
Expand Down
36 changes: 30 additions & 6 deletions ...st/resourcefixture/testdata/basic/secretmanager/v1beta1/fullsecretmanagersecret/_http.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,11 @@ x-goog-request-params: parent=projects%2F${projectId}
"managed-by-cnrm": "true"
},
"replication": {
"automatic": {}
"automatic": {
"customerManagedEncryption": {
"kmsKeyName": "projects/${projectId}/locations/global/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
}
}
},
"rotation": {
"nextRotationTime": "2025-10-02T15:01:23Z",
Expand Down Expand Up @@ -737,7 +741,11 @@ X-Xss-Protection: 0
},
"name": "projects/${projectNumber}/secrets/secretmanagersecret-${uniqueId}",
"replication": {
"automatic": {}
"automatic": {
"customerManagedEncryption": {
"kmsKeyName": "projects/${projectId}/locations/global/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
}
}
},
"rotation": {
"nextRotationTime": "2025-10-02T15:01:23Z",
Expand Down Expand Up @@ -782,7 +790,11 @@ X-Xss-Protection: 0
},
"name": "projects/${projectNumber}/secrets/secretmanagersecret-${uniqueId}",
"replication": {
"automatic": {}
"automatic": {
"customerManagedEncryption": {
"kmsKeyName": "projects/${projectId}/locations/global/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
}
}
},
"rotation": {
"nextRotationTime": "2025-10-02T15:01:23Z",
Expand Down Expand Up @@ -816,7 +828,11 @@ x-goog-request-params: secret.name=projects%2F${projectId}%2Fsecrets%2Fsecretman
},
"name": "projects/${projectId}/secrets/secretmanagersecret-${uniqueId}",
"replication": {
"automatic": {}
"automatic": {
"customerManagedEncryption": {
"kmsKeyName": "projects/${projectId}/locations/global/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
}
}
},
"rotation": {
"nextRotationTime": "2025-10-03T15:01:23Z",
Expand Down Expand Up @@ -855,7 +871,11 @@ X-Xss-Protection: 0
},
"name": "projects/${projectNumber}/secrets/secretmanagersecret-${uniqueId}",
"replication": {
"automatic": {}
"automatic": {
"customerManagedEncryption": {
"kmsKeyName": "projects/${projectId}/locations/global/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
}
}
},
"rotation": {
"nextRotationTime": "2025-10-03T15:01:23Z",
Expand Down Expand Up @@ -901,7 +921,11 @@ X-Xss-Protection: 0
},
"name": "projects/${projectNumber}/secrets/secretmanagersecret-${uniqueId}",
"replication": {
"automatic": {}
"automatic": {
"customerManagedEncryption": {
"kmsKeyName": "projects/${projectId}/locations/global/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
}
}
},
"rotation": {
"nextRotationTime": "2025-10-03T15:01:23Z",
Expand Down
8 changes: 4 additions & 4 deletions .../resourcefixture/testdata/basic/secretmanager/v1beta1/fullsecretmanagersecret/create.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ spec:
automatic: true
# TF-based resource is broken, got the error even if not changing this field
# "cannot make changes to immutable field(s): [Field Name: replication.0.auto.#, Got: 1, Wanted: 0]"
# auto:
# customerManagedEncryption:
# kmsKeyRef:
# name: kmscryptokey-${uniqueId}
auto:
customerManagedEncryption:
kmsKeyRef:
name: kmscryptokey-${uniqueId}
topics:
- topicRef:
name: topic-${uniqueId}
Expand Down
2 changes: 2 additions & 0 deletions ...rcefixture/testdata/basic/secretmanager/v1beta1/fullsecretmanagersecret/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ apiVersion: kms.cnrm.cloud.google.com/v1beta1
kind: KMSCryptoKey
metadata:
name: kmscryptokey-${uniqueId}
annotations:
cnrm.cloud.google.com/project-id: ${projectId}
spec:
keyRingRef:
name: kmskeyring-${uniqueId}
Expand Down
12 changes: 6 additions & 6 deletions .../resourcefixture/testdata/basic/secretmanager/v1beta1/fullsecretmanagersecret/update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ metadata:
spec:
replication:
automatic: true
# TF-based resource is broken, got the error even if not changing this field
# "cannot make changes to immutable field(s): [Field Name: replication.0.auto.#, Got: 1, Wanted: 0]"
# auto:
# customerManagedEncryption:
# kmsKeyRef:
# name: kmscryptokey-${uniqueId}
# TF-based resource is broken, got the error even if not changing this field
# "cannot make changes to immutable field(s): [Field Name: replication.0.auto.#, Got: 1, Wanted: 0]"
auto:
customerManagedEncryption:
kmsKeyRef:
name: kmscryptokey-${uniqueId}
topics:
- topicRef:
name: topic-2-${uniqueId}
Expand Down
Loading