Merge pull request #67 from ninech/fix-env-removal

fix: panic during env removal
ninech · Oct 31, 2023 · 6a20c17 · 6a20c17
2 parents 8307017 + db8f956
commit 6a20c17
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/update/application.go b/update/application.go
@@ -161,7 +161,7 @@ func (cmd *applicationCmd) applyUpdates(app *apps.Application) {
 	}
 
 	var buildDelEnv []string
-	if cmd.DeleteEnv != nil {
+	if cmd.DeleteBuildEnv != nil {
 		buildDelEnv = *cmd.DeleteBuildEnv
 	}
 	app.Spec.ForProvider.BuildEnv = util.UpdateEnvVars(app.Spec.ForProvider.BuildEnv, buildEnv, buildDelEnv)

diff --git a/update/application_test.go b/update/application_test.go
@@ -130,16 +130,26 @@ func TestApplication(t *testing.T) {
 				assert.Nil(t, util.EnvVarByName(updated.Spec.ForProvider.BuildEnv, BuildTrigger))
 			},
 		},
-		"reset env variables": {
+		"reset env variable": {
+			orig: existingApp,
+			cmd: applicationCmd{
+				Name:      pointer.String(existingApp.Name),
+				DeleteEnv: &[]string{"foo"},
+			},
+			checkApp: func(t *testing.T, cmd applicationCmd, orig, updated *apps.Application) {
+				assert.Empty(t, updated.Spec.ForProvider.Config.Env)
+				assert.NotEmpty(t, updated.Spec.ForProvider.BuildEnv)
+			},
+		},
+		"reset build env variable": {
 			orig: existingApp,
 			cmd: applicationCmd{
 				Name:           pointer.String(existingApp.Name),
-				DeleteEnv:      &[]string{"foo"},
 				DeleteBuildEnv: &[]string{"BP_ENVIRONMENT_VARIABLE"},
 			},
 			checkApp: func(t *testing.T, cmd applicationCmd, orig, updated *apps.Application) {
-				assert.Equal(t, apps.EnvVars{}, updated.Spec.ForProvider.Config.Env)
-				assert.Equal(t, apps.EnvVars{}, updated.Spec.ForProvider.BuildEnv)
+				assert.Empty(t, updated.Spec.ForProvider.BuildEnv)
+				assert.NotEmpty(t, updated.Spec.ForProvider.Config.Env)
 			},
 		},
 		"git auth update user/pass": {