add associated resource id information in the disassociate command

Author: GokceGK

internal/cmd/beta/public-ip/associate/associate.go

@@ -55,7 +55,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return err
 			}
 
-			publicIpLabel, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
+			publicIpLabel, _, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public IP: %v", err)
 				publicIpLabel = model.PublicIpId

internal/cmd/beta/public-ip/delete/delete.go

@@ -53,7 +53,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return err
 			}
 
-			publicIpLabel, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
+			publicIpLabel, _, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public IP: %v", err)
 				publicIpLabel = model.PublicIpId

internal/cmd/beta/public-ip/disassociate/disassociate.go

@@ -51,14 +51,14 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return err
 			}
 
-			publicIpLabel, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
+			publicIpLabel, associatedResourceId, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public IP: %v", err)
 				publicIpLabel = model.PublicIpId
 			}
 
 			if !model.AssumeYes {
-				prompt := fmt.Sprintf("Are you sure you want to disassociate public IP %q from the associated resource?", publicIpLabel)
+				prompt := fmt.Sprintf("Are you sure you want to disassociate public IP %q from the associated resource %q?", publicIpLabel, associatedResourceId)
 				err = p.PromptForConfirmation(prompt)
 				if err != nil {
 					return err
@@ -72,7 +72,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("disassociate public IP: %w", err)
 			}
 
-			p.Outputf("Disassociated public IP %q from the associated resource.\n", publicIpLabel)
+			p.Outputf("Disassociated public IP %q from the associated resource %q.\n", publicIpLabel, associatedResourceId)
 			return nil
 		},
 	}

internal/cmd/beta/public-ip/update/update.go

@@ -61,7 +61,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return err
 			}
 
-			publicIpLabel, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
+			publicIpLabel, _, err := iaasUtils.GetPublicIP(ctx, apiClient, model.ProjectId, model.PublicIpId)
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public IP: %v", err)
 				publicIpLabel = model.PublicIpId

internal/pkg/services/iaas/utils/utils.go

@@ -17,12 +17,16 @@ type IaaSClient interface {
 	GetNetworkAreaRangeExecute(ctx context.Context, organizationId, areaId, networkRangeId string) (*iaas.NetworkRange, error)
 }
 
-func GetPublicIP(ctx context.Context, apiClient IaaSClient, projectId, publicIpId string) (string, error) {
+func GetPublicIP(ctx context.Context, apiClient IaaSClient, projectId, publicIpId string) (string, string, error) {
 	resp, err := apiClient.GetPublicIPExecute(ctx, projectId, publicIpId)
 	if err != nil {
-		return "", fmt.Errorf("get public ip: %w", err)
+		return "", "", fmt.Errorf("get public ip: %w", err)
 	}
-	return *resp.Ip, nil
+	associatedResourceId := ""
+	if resp.GetNetworkInterface() != nil {
+		associatedResourceId = *resp.GetNetworkInterface()
+	}
+	return *resp.Ip, associatedResourceId, nil
 }
 
 func GetServerName(ctx context.Context, apiClient IaaSClient, projectId, serverId string) (string, error) {

internal/pkg/services/iaas/utils/utils_test.go

@@ -91,7 +91,8 @@ func TestGetPublicIp(t *testing.T) {
 			name: "base",
 			args: args{
 				getPublicIpResp: &iaas.PublicIp{
-					Ip: utils.Ptr("1.2.3.4"),
+					Ip:               utils.Ptr("1.2.3.4"),
+					NetworkInterface: iaas.NewNullableString(utils.Ptr("1.2.3.4")),
 				},
 			},
 			want: "1.2.3.4",
@@ -110,7 +111,7 @@ func TestGetPublicIp(t *testing.T) {
 				GetPublicIpFails: tt.args.getPublicIpFails,
 				GetPublicIpResp:  tt.args.getPublicIpResp,
 			}
-			got, err := GetPublicIP(context.Background(), m, "", "")
+			got, _, err := GetPublicIP(context.Background(), m, "", "")
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetPublicIP() error = %v, wantErr %v", err, tt.wantErr)
 				return