mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-05-05 15:55:24 -04:00
cli: unify terraform variable creation (#2119)
Before we defined the variables twice. Once for upgrades, once for create. Also move default node group names into a constant
This commit is contained in:
parent
f9391ed903
commit
cf822f7eee
19 changed files with 464 additions and 451 deletions
|
@ -188,6 +188,7 @@ func TestCreator(t *testing.T) {
|
|||
wantErr: true,
|
||||
},
|
||||
"unknown provider": {
|
||||
tfClient: &stubTerraformClient{},
|
||||
provider: cloudprovider.Unknown,
|
||||
config: config.Default(),
|
||||
wantErr: true,
|
||||
|
@ -257,43 +258,43 @@ func (s stubPolicyPatcher) Patch(_ context.Context, _ string) error {
|
|||
|
||||
func TestNormalizeAzureURIs(t *testing.T) {
|
||||
testCases := map[string]struct {
|
||||
in terraform.AzureClusterVariables
|
||||
want terraform.AzureClusterVariables
|
||||
in *terraform.AzureClusterVariables
|
||||
want *terraform.AzureClusterVariables
|
||||
}{
|
||||
"empty": {
|
||||
in: terraform.AzureClusterVariables{},
|
||||
want: terraform.AzureClusterVariables{},
|
||||
in: &terraform.AzureClusterVariables{},
|
||||
want: &terraform.AzureClusterVariables{},
|
||||
},
|
||||
"no change": {
|
||||
in: terraform.AzureClusterVariables{
|
||||
in: &terraform.AzureClusterVariables{
|
||||
ImageID: "/communityGalleries/foo/images/constellation/versions/2.1.0",
|
||||
},
|
||||
want: terraform.AzureClusterVariables{
|
||||
want: &terraform.AzureClusterVariables{
|
||||
ImageID: "/communityGalleries/foo/images/constellation/versions/2.1.0",
|
||||
},
|
||||
},
|
||||
"fix image id": {
|
||||
in: terraform.AzureClusterVariables{
|
||||
in: &terraform.AzureClusterVariables{
|
||||
ImageID: "/CommunityGalleries/foo/Images/constellation/Versions/2.1.0",
|
||||
},
|
||||
want: terraform.AzureClusterVariables{
|
||||
want: &terraform.AzureClusterVariables{
|
||||
ImageID: "/communityGalleries/foo/images/constellation/versions/2.1.0",
|
||||
},
|
||||
},
|
||||
"fix resource group": {
|
||||
in: terraform.AzureClusterVariables{
|
||||
in: &terraform.AzureClusterVariables{
|
||||
UserAssignedIdentity: "/subscriptions/foo/resourcegroups/test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai",
|
||||
},
|
||||
want: terraform.AzureClusterVariables{
|
||||
want: &terraform.AzureClusterVariables{
|
||||
UserAssignedIdentity: "/subscriptions/foo/resourceGroups/test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai",
|
||||
},
|
||||
},
|
||||
"fix arbitrary casing": {
|
||||
in: terraform.AzureClusterVariables{
|
||||
in: &terraform.AzureClusterVariables{
|
||||
ImageID: "/CoMMUnitygaLLeries/foo/iMAges/constellation/vERsions/2.1.0",
|
||||
UserAssignedIdentity: "/subsCRiptions/foo/resoURCegroups/test/proViDers/MICROsoft.mANAgedIdentity/USerASsignediDENtities/uai",
|
||||
},
|
||||
want: terraform.AzureClusterVariables{
|
||||
want: &terraform.AzureClusterVariables{
|
||||
ImageID: "/communityGalleries/foo/images/constellation/versions/2.1.0",
|
||||
UserAssignedIdentity: "/subscriptions/foo/resourceGroups/test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uai",
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue