Merge pull request #201 from open-amt-cloud-toolkit/localPasswordPrompt

fix: ensure warning for CCM deactivation password flag

CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="v2.14.2"></a>
+## [v2.14.2] - 2023-09-08
+### Fix
+- ensure warning for CCM deactivation password flag
+
 <a name="v2.14.1"></a>
 ## [v2.14.1] - 2023-09-06
 ### Fix

internal/flags/deactivate_test.go

@@ -74,7 +74,14 @@ func TestHandleDeactivateCommandWithForce(t *testing.T) {
 	assert.Equal(t, expected, flags.Command)
 }
 
-func TestHandleLocalDeactivation(t *testing.T) {
+func TestHandleLocalDeactivationWithPassword(t *testing.T) {
+	args := []string{"./rpc", "deactivate", "-local", "--password", "p@ssword"}
+	flags := NewFlags(args)
+	errCode := flags.ParseFlags()
+	assert.Equal(t, errCode, utils.Success)
+}
+
+func TestHandleLocalDeactivationWithoutPassword(t *testing.T) {
 	args := []string{"./rpc", "deactivate", "-local"}
 	flags := NewFlags(args)
 	errCode := flags.ParseFlags()

internal/local/deactivate.go

@@ -46,6 +46,9 @@ func (service *ProvisioningService) DeactivateACM() int {
 }
 
 func (service *ProvisioningService) DeactivateCCM() int {
+	if service.flags.Password != "" {
+		log.Warn("Password not required for CCM deactivation")
+	}
 	status, err := service.amtCommand.Unprovision()
 	if err != nil || status != 0 {
 		log.Error("Status: Failed to deactivate ", err)

internal/local/deactivate_test.go

@@ -38,7 +38,14 @@ func TestDeactivateCCM(t *testing.T) {
 	f.LocalConfig.Password = "P@ssw0rd"
 	mockControlMode = 1
 
-	t.Run("returns Success for happy path", func(t *testing.T) {
+	t.Run("returns Success without password", func(t *testing.T) {
+		f.Password = ""
+		lps := setupService(f)
+		resultCode := lps.Deactivate()
+		assert.Equal(t, utils.Success, resultCode)
+	})
+	t.Run("returns Success with warning, given the password", func(t *testing.T) {
+		f.Password = "P@ssw0rd"
 		lps := setupService(f)
 		resultCode := lps.Deactivate()
 		assert.Equal(t, utils.Success, resultCode)

pkg/utils/constants.go

@@ -8,7 +8,7 @@ const (
 	// ProjectName is the name of the executable
 	ProjectName = "rpc"
 	// ProjectVersion is the full version of this executable
-	ProjectVersion  = "2.14.1"
+	ProjectVersion  = "2.14.2"
 	ProtocolVersion = "4.0.0"
 	// ClientName is the name of the exectable
 	ClientName = "RPC"