-
Notifications
You must be signed in to change notification settings - Fork 231
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3176 from yuwenma/secret-manager-ref-refactor
chore: refactor the external reference for SecretManagerSecret
- Loading branch information
Showing
5 changed files
with
199 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // Copyright 2024 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package common | ||
|
|
||
| func ValueOf[T any](t *T) T { | ||
| var zeroVal T | ||
| if t == nil { | ||
| return zeroVal | ||
| } | ||
| return *t | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright 2024 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package v1beta1 | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/GoogleCloudPlatform/k8s-config-connector/apis/common" | ||
| refsv1beta1 "github.com/GoogleCloudPlatform/k8s-config-connector/apis/refs/v1beta1" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| type SecretIdentity struct { | ||
| id string | ||
| parent *SecretParent | ||
| } | ||
|
|
||
| func (i *SecretIdentity) String() string { | ||
| return i.parent.String() + "/secrets/" + i.id | ||
| } | ||
|
|
||
| func (r *SecretIdentity) Parent() *SecretParent { | ||
| return r.parent | ||
| } | ||
|
|
||
| func (r *SecretIdentity) ID() string { | ||
| return r.id | ||
| } | ||
|
|
||
| type SecretParent struct { | ||
| ProjectID string | ||
| } | ||
|
|
||
| func (p *SecretParent) String() string { | ||
| return "projects/" + p.ProjectID | ||
| } | ||
|
|
||
| func NewSecretIdentity(ctx context.Context, reader client.Reader, obj *SecretManagerSecret, u *unstructured.Unstructured) (*SecretIdentity, error) { | ||
| // Get Parent | ||
| projectID, err := refsv1beta1.ResolveProjectID(ctx, reader, u) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| // Get desired ID | ||
| resourceID := common.ValueOf(obj.Spec.ResourceID) | ||
| if resourceID == "" { | ||
| resourceID = obj.GetName() | ||
| } | ||
| if resourceID == "" { | ||
| return nil, fmt.Errorf("cannot resolve resource ID") | ||
| } | ||
|
|
||
| // Use approved External | ||
| externalRef := common.ValueOf(obj.Status.ExternalRef) | ||
| if externalRef != "" { | ||
| actualIdentity, err := ParseSecretExternal(externalRef) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if actualIdentity.parent.ProjectID != projectID { | ||
| return nil, fmt.Errorf("spec.projectRef changed, expect %s, got %s", actualIdentity.parent.ProjectID, projectID) | ||
| } | ||
| if actualIdentity.id != resourceID { | ||
| return nil, fmt.Errorf("cannot reset `metadata.name` or `spec.resourceID` to %s, since it has already assigned to %s", | ||
| resourceID, actualIdentity.id) | ||
| } | ||
| } | ||
|
|
||
| return &SecretIdentity{ | ||
| parent: &SecretParent{ProjectID: projectID}, | ||
| id: resourceID, | ||
| }, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.