chore: update 'dev extract' command to work with bundles built from a uds-bundle.tf source #1061
Conversation
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
YrrepNoj
commented
Jan 23, 2025
| @@ -233,6 +234,69 @@ func handleZarfInitOpts(pkgVars zarfVarData, zarfPkgKind v1alpha1.ZarfPackageKin | |||
| return zarfInitOpts | |||
| } | |||
|
|
|||
| // PreDeployValidationTF validates a bundle that has been built from a .tf file before deployment | |||
| // TODO: This function shares (copied) a lot of code from PreDeployValidation(). Work towards consolidating what makes sense. | |||
There was a problem hiding this comment.
I apologize for my sins; I will look at this a bit tomorrow morning.
There was a problem hiding this comment.
Meh, I'm sure the compiler reduces it to shared code anyway :P
catsby
approved these changes
Jan 24, 2025
Comment on lines
+166
to
176
| if bundleCfg.IsTofu { | ||
| _, _, _, err = bndlClient.PreDeployValidationTF() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } else { | ||
| _, _, _, err = bndlClient.PreDeployValidation() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } |
There was a problem hiding this comment.
nit: same style nit from other pr; this just reduces nested if err{} blocks
Suggested change
| if bundleCfg.IsTofu { | |
| _, _, _, err = bndlClient.PreDeployValidationTF() | |
| if err != nil { | |
| return err | |
| } | |
| } else { | |
| _, _, _, err = bndlClient.PreDeployValidation() | |
| if err != nil { | |
| return err | |
| } | |
| } | |
| if bundleCfg.IsTofu { | |
| _, _, _, err = bndlClient.PreDeployValidationTF() | |
| } else { | |
| _, _, _, err = bndlClient.PreDeployValidation() | |
| } | |
| if err != nil { | |
| return err | |
| } |
| @@ -233,6 +234,69 @@ func handleZarfInitOpts(pkgVars zarfVarData, zarfPkgKind v1alpha1.ZarfPackageKin | |||
| return zarfInitOpts | |||
| } | |||
|
|
|||
| // PreDeployValidationTF validates a bundle that has been built from a .tf file before deployment | |||
| // TODO: This function shares (copied) a lot of code from PreDeployValidation(). Work towards consolidating what makes sense. | |||
There was a problem hiding this comment.
Meh, I'm sure the compiler reduces it to shared code anyway :P
| config.BundleAlwaysPull = []string{config.BundleTF, config.BundleTFConfig} | ||
| filepaths, err := provider.LoadBundleMetadata() | ||
| if err != nil { | ||
| message.Warnf("@JPERRY error when loading the metadtaa of the .tf bundle: %s\n", err.Error()) |
There was a problem hiding this comment.
Suggested change
| message.Warnf("@JPERRY error when loading the metadtaa of the .tf bundle: %s\n", err.Error()) | |
| message.Warnf("error when loading the metadata of the .tf bundle: %s\n", err.Error()) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Bundles created from a
uds-bundle.tfsource file store the SHA256 checksum of the Zarf Package manifest in different place than bundles created from auds-bundle.yamlType of change
Checklist before merging
😰😬🙈