-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
- Loading branch information
Showing
9 changed files
with
160 additions
and
15 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
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,70 @@ | ||
| // Copyright 2023 Upbound Inc. | ||
| // | ||
| // 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 migration | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| ) | ||
|
|
||
| func (pg *PlanGenerator) convertPackageLock(o UnstructuredWithMetadata) error { | ||
| lock, err := toPackageLock(o.Object) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| isConverted := false | ||
| for _, lockConv := range pg.registry.packageLockConverters { | ||
| if lockConv.re == nil || lockConv.converter == nil || !lockConv.re.MatchString(lock.GetName()) { | ||
| continue | ||
| } | ||
| if err := lockConv.converter.PackageLockV1Beta1(lock); err != nil { | ||
| return errors.Wrapf(err, "failed to call converter on package lock: %s", lock.GetName()) | ||
| } | ||
| // TODO: if a lock converter does not convert the given lock, | ||
| // we will have a false positive. Better to compute and check | ||
| // a diff here. | ||
| isConverted = true | ||
| } | ||
| if !isConverted { | ||
| return nil | ||
| } | ||
| target := &UnstructuredWithMetadata{ | ||
| Object: ToSanitizedUnstructured(lock), | ||
| Metadata: o.Metadata, | ||
| } | ||
| if err := pg.stepEditPackageLock(o, target); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (pg *PlanGenerator) stepEditPackageLock(source UnstructuredWithMetadata, t *UnstructuredWithMetadata) error { | ||
| // add step for editing the package lock | ||
| s := pg.stepConfiguration(stepEditPackageLock) | ||
| t.Metadata.Path = fmt.Sprintf("%s/%s.yaml", s.Name, getVersionedName(t.Object)) | ||
| s.Patch.Files = append(s.Patch.Files, t.Metadata.Path) | ||
| patchMap, err := computeJSONMergePathDoc(source.Object, t.Object) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return errors.Wrap(pg.target.Put(UnstructuredWithMetadata{ | ||
| Object: unstructured.Unstructured{ | ||
| Object: addNameGVK(t.Object, patchMap), | ||
| }, | ||
| Metadata: t.Metadata, | ||
| }), errEditConfigurationPackageFmt) | ||
| } |
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
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
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
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
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
14 changes: 14 additions & 0 deletions
14
...ation/testdata/plan/generated/edit-package-lock/lock.locks.pkg.crossplane.io_v1beta1.yaml
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,14 @@ | ||
| apiVersion: pkg.crossplane.io/v1beta1 | ||
| kind: Lock | ||
| metadata: | ||
| name: lock | ||
| packages: | ||
| - name: provider-aws | ||
| type: Provider | ||
| source: xpkg.upbound.io/upbound/provider-aws | ||
| version: v0.36.0 | ||
| - name: test-provider | ||
| type: Provider | ||
| source: xpkg.upbound.io/upbound/test-provider | ||
| version: vX.Y.Z | ||
|
|
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,13 @@ | ||
| apiVersion: pkg.crossplane.io/v1beta1 | ||
| kind: Lock | ||
| metadata: | ||
| creationTimestamp: "2023-05-15T12:37:16Z" | ||
| generation: 9 | ||
| name: lock | ||
| resourceVersion: "10366" | ||
| uid: b1aabaaa-56bb-4356-ae45-1e3131cb9743 | ||
| packages: | ||
| - name: provider-aws | ||
| type: Provider | ||
| source: xpkg.upbound.io/upbound/provider-aws | ||
| version: v0.36.0 |