Revert "fix(LH-72951): Handle FTD license update (#107)" (#108)

CiscoDevNet · Nov 21, 2023 · 8c5a448 · 8c5a448
1 parent af16243
commit 8c5a448
Show file tree

Hide file tree

Showing 29 changed files with 68 additions and 692 deletions.
diff --git a/client/device/cloudfmc/fmcappliance/update.go b/client/device/cloudfmc/fmcappliance/update.go
@@ -9,10 +9,10 @@ import (
 type UpdateInput struct {
 	FmcApplianceUid     string
 	QueueTriggerState   string
-	StateMachineContext *map[string]string
+	StateMachineContext map[string]string
 }
 
-func NewUpdateInput(FmcApplianceUid, queueTriggerState string, stateMachineContext *map[string]string) UpdateInput {
+func NewUpdateInput(FmcApplianceUid, queueTriggerState string, stateMachineContext map[string]string) UpdateInput {
 	return UpdateInput{
 		FmcApplianceUid:     FmcApplianceUid,
 		QueueTriggerState:   queueTriggerState,
@@ -27,17 +27,15 @@ type UpdateOutput struct {
 }
 
 type updateRequestBody struct {
-	QueueTriggerState   string             `json:"queueTriggerState"`
-	StateMachineContext *map[string]string `json:"stateMachineContext,omitempty"`
-	Uid                 string             `json:"uid,omitempty"`
+	QueueTriggerState   string            `json:"queueTriggerState"`
+	StateMachineContext map[string]string `json:"stateMachineContext"`
 }
 
 func Update(ctx context.Context, client http.Client, updateInp UpdateInput) (*UpdateOutput, error) {
 	updateUrl := url.UpdateFmcAppliance(client.BaseUrl(), updateInp.FmcApplianceUid)
 	updateBody := newUpdateRequestBodyBuilder().
 		QueueTriggerState(updateInp.QueueTriggerState).
 		StateMachineContext(updateInp.StateMachineContext).
-		Uid(updateInp.FmcApplianceUid).
 		Build()
 	req := client.NewPut(ctx, updateUrl, updateBody)
 	var updateOup UpdateOutput

diff --git a/client/device/cloudfmc/fmcappliance/update_inputbuilder.go b/client/device/cloudfmc/fmcappliance/update_inputbuilder.go
@@ -20,7 +20,7 @@ func (b *UpdateInputBuilder) QueueTriggerState(queueTriggerState string) *Update
 	return b
 }
 
-func (b *UpdateInputBuilder) StateMachineContext(stateMachineContext *map[string]string) *UpdateInputBuilder {
+func (b *UpdateInputBuilder) StateMachineContext(stateMachineContext map[string]string) *UpdateInputBuilder {
 	b.updateInput.StateMachineContext = stateMachineContext
 	return b
 }

diff --git a/client/device/cloudfmc/fmcappliance/update_outputbuilder.go b/client/device/cloudfmc/fmcappliance/update_outputbuilder.go
@@ -44,16 +44,11 @@ func (b *updateRequestBodyBuilder) QueueTriggerState(queueTriggerState string) *
 	return b
 }
 
-func (b *updateRequestBodyBuilder) StateMachineContext(stateMachineContext *map[string]string) *updateRequestBodyBuilder {
+func (b *updateRequestBodyBuilder) StateMachineContext(stateMachineContext map[string]string) *updateRequestBodyBuilder {
 	b.updateRequestBody.StateMachineContext = stateMachineContext
 	return b
 }
 
-func (b *updateRequestBodyBuilder) Uid(uid string) *updateRequestBodyBuilder {
-	b.updateRequestBody.Uid = uid
-	return b
-}
-
 func (b *updateRequestBodyBuilder) Build() updateRequestBody {
 	return *b.updateRequestBody
 }
diff --git a/client/device/cloudfmc/fmcappliance/update_test.go b/client/device/cloudfmc/fmcappliance/update_test.go
@@ -31,7 +31,7 @@ func TestUpdate(t *testing.T) {
 	}{
 		{
 			testName: "successfully updates FMC Appliance name",
-			input:    fmcappliance.NewUpdateInput(fmcApplianceUid, queueTriggerState, &stateMachineContext),
+			input:    fmcappliance.NewUpdateInput(fmcApplianceUid, queueTriggerState, stateMachineContext),
 
 			setupFunc: func() {
 				httpmock.RegisterResponder(
@@ -50,7 +50,7 @@ func TestUpdate(t *testing.T) {
 
 		{
 			testName: "error when update FMC Appliance name error",
-			input:    fmcappliance.NewUpdateInput(fmcApplianceUid, queueTriggerState, &stateMachineContext),
+			input:    fmcappliance.NewUpdateInput(fmcApplianceUid, queueTriggerState, stateMachineContext),
 
 			setupFunc: func() {
 				httpmock.RegisterResponder(

diff --git a/client/device/cloudfmc/fmcplatform/read_devicelicenses.go b/client/device/cloudfmc/fmcplatform/read_devicelicenses.go
diff --git a/client/device/cloudfmc/fmcplatform/read_devicelicenses_inputbuilder.go b/client/device/cloudfmc/fmcplatform/read_devicelicenses_inputbuilder.go
diff --git a/...e/cloudfmc/fmcplatform/read_domaininfo.go → ...ce/cloudfmc/fmcplatform/readdomaininfo.go b/...e/cloudfmc/fmcplatform/read_domaininfo.go → ...ce/cloudfmc/fmcplatform/readdomaininfo.go
diff --git a/...udfmc/fmcplatform/read_domaininfo_test.go → ...oudfmc/fmcplatform/readdomaininfo_test.go b/...udfmc/fmcplatform/read_domaininfo_test.go → ...oudfmc/fmcplatform/readdomaininfo_test.go
diff --git a/client/device/cloudfmc/fmcplatform/update_devicelicenses.go b/client/device/cloudfmc/fmcplatform/update_devicelicenses.go
diff --git a/client/device/cloudfmc/fmcplatform/update_devicelicenses_inputbuilder.go b/client/device/cloudfmc/fmcplatform/update_devicelicenses_inputbuilder.go
diff --git a/client/device/cloudfmc/read.go b/client/device/cloudfmc/read.go
@@ -19,8 +19,6 @@ func NewReadInput() ReadInput {
 
 type ReadOutput = device.ReadOutput
 
-var NewReadOutputBuilder = device.NewReadOutputBuilder
-
 func Read(ctx context.Context, client http.Client, readInp ReadInput) (*ReadOutput, error) {
 
 	client.Logger.Println("reading cloud FMC")

diff --git a/client/device/cloudfmc/readspecific.go b/client/device/cloudfmc/readspecific.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"github.com/CiscoDevnet/terraform-provider-cdo/go-client/device"
 	"github.com/CiscoDevnet/terraform-provider-cdo/go-client/internal/http"
-	"github.com/CiscoDevnet/terraform-provider-cdo/go-client/model/statemachine"
 	"github.com/CiscoDevnet/terraform-provider-cdo/go-client/model/statemachine/state"
 )
 
@@ -13,11 +12,10 @@ type ReadSpecificInput struct {
 }
 
 type ReadSpecificOutput struct {
-	SpecificUid         string               `json:"uid"`
-	DomainUid           string               `json:"domainUid"`
-	State               state.Type           `json:"state"`
-	Status              string               `json:"status"`
-	StateMachineDetails statemachine.Details `json:"stateMachineDetails"`
+	SpecificUid string     `json:"uid"`
+	DomainUid   string     `json:"domainUid"`
+	State       state.Type `json:"state"`
+	Status      string     `json:"status"`
 }
 
 func NewReadSpecificInput(fmcId string) ReadSpecificInput {
@@ -28,8 +26,6 @@ func NewReadSpecificInput(fmcId string) ReadSpecificInput {
 
 func ReadSpecific(ctx context.Context, client http.Client, inp ReadSpecificInput) (*ReadSpecificOutput, error) {
 
-	client.Logger.Println("reading Cloud FMC specific")
-
 	req := device.NewReadSpecificRequest(ctx, client, *device.NewReadSpecificInput(inp.FmcId))
 
 	var readSpecificOutp ReadSpecificOutput

diff --git a/client/device/cloudfmc/retry.go b/client/device/cloudfmc/retry.go
diff --git a/client/device/cloudftd/cloudftdonboarding/create.go b/client/device/cloudftd/cloudftdonboarding/create.go
@@ -104,7 +104,7 @@ func Create(ctx context.Context, client http.Client, createInp CreateInput) (*Cr
 
 	// 3.1 read ftd metadata
 	// 3.1.5 handle license
-	licenseCaps, err := license.StringToCdoLicenses(readFtdOutp.Metadata.LicenseCaps)
+	licenseCaps, err := license.DeserializeAllFromCdo(readFtdOutp.Metadata.LicenseCaps)
 	if err != nil {
 		return nil, err
 	}

diff --git a/client/device/cloudftd/create.go b/client/device/cloudftd/create.go
@@ -119,7 +119,7 @@ func Create(ctx context.Context, client http.Client, createInp CreateInput) (*Cr
 		Metadata: &Metadata{
 			AccessPolicyName: selectedPolicy.Name,
 			AccessPolicyUid:  selectedPolicy.Id,
-			LicenseCaps:      license.LicensesToString(*createInp.Licenses),
+			LicenseCaps:      license.SerializeAllAsCdo(*createInp.Licenses),
 			PerformanceTier:  performanceTier,
 		},
 		State: "NEW",

diff --git a/client/device/cloudftd/create_metadatabuilder.go b/client/device/cloudftd/create_metadatabuilder.go
@@ -36,7 +36,7 @@ func (b *MetadataBuilder) GeneratedCommand(generatedCommand string) *MetadataBui
 }
 
 func (b *MetadataBuilder) LicenseCaps(licenseCaps *[]license.Type) *MetadataBuilder {
-	b.metadata.LicenseCaps = license.LicensesToString(*licenseCaps)
+	b.metadata.LicenseCaps = license.SerializeAllAsCdo(*licenseCaps)
 	return b
 }
 

diff --git a/client/device/cloudftd/delete.go b/client/device/cloudftd/delete.go
@@ -43,7 +43,7 @@ func Delete(ctx context.Context, client http.Client, deleteInp DeleteInput) (*De
 		fmcappliance.NewUpdateInputBuilder().
 			FmcApplianceUid(fmcReadSpecificRes.SpecificUid).
 			QueueTriggerState("PENDING_DELETE_FTDC").
-			StateMachineContext(&map[string]string{"ftdCDeviceIDs": deleteInp.Uid}).
+			StateMachineContext(map[string]string{"ftdCDeviceIDs": deleteInp.Uid}).
 			Build(),
 	)
 	if err != nil {