revert tags generator comparator change

hashicorp · Sep 26, 2024 · 33de098 · 33de098
1 parent dac6e5b
commit 33de098
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/internal/generate/tags/main.go b/internal/generate/tags/main.go
@@ -83,7 +83,6 @@ var (
 	updateTagsFunc             = flag.String("UpdateTagsFunc", defaultUpdateTagsFunc, "updateTagsFunc")
 	waitTagsPropagatedFunc     = flag.String("WaitFunc", defaultWaitTagsPropagatedFunc, "waitFunc")
 	waitContinuousOccurence    = flag.Int("WaitContinuousOccurence", 0, "ContinuousTargetOccurence for Wait function")
-	waitFuncComparator         = flag.String("WaitFuncComparator", "Equal", "waitFuncComparator")
 	waitDelay                  = flag.Duration("WaitDelay", 0, "Delay for Wait function")
 	waitMinTimeout             = flag.Duration("WaitMinTimeout", 0, `"MinTimeout" (minimum poll interval) for Wait function`)
 	waitPollInterval           = flag.Duration("WaitPollInterval", 0, "PollInterval for Wait function")
@@ -215,7 +214,6 @@ type TemplateData struct {
 	WaitTagsPropagatedFunc     string
 	WaitContinuousOccurence    int
 	WaitDelay                  string
-	WaitFuncComparator         string
 	WaitMinTimeout             string
 	WaitPollInterval           string
 	WaitTimeout                string
@@ -372,7 +370,6 @@ func main() {
 		UpdateTagsFunc:             *updateTagsFunc,
 		UpdateTagsIgnoreSystem:     !*updateTagsNoIgnoreSystem,
 		WaitForPropagation:         *waitForPropagation,
-		WaitFuncComparator:         *waitFuncComparator,
 		WaitTagsPropagatedFunc:     *waitTagsPropagatedFunc,
 		WaitContinuousOccurence:    *waitContinuousOccurence,
 		WaitDelay:                  formatDuration(*waitDelay),

diff --git a/internal/generate/tags/templates/v2/wait_tags_propagated_body.gtpl b/internal/generate/tags/templates/v2/wait_tags_propagated_body.gtpl
@@ -22,7 +22,7 @@ func {{ .WaitTagsPropagatedFunc }}(ctx context.Context, conn {{ .ClientType }},
 			output = output.IgnoreConfig(inContext.IgnoreConfig)
 		}
 
-        return output.{{ .WaitFuncComparator }}(tags), nil
+        return output.Equal(tags), nil
 	}
 	opts := tfresource.WaitOpts{
 		{{- if ne .WaitContinuousOccurence 0 }}

diff --git a/internal/service/dynamodb/generate.go b/internal/service/dynamodb/generate.go
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 //go:generate go run ../../generate/tagresource/main.go
-//go:generate go run ../../generate/tags/main.go -GetTag -ListTags -ListTagsOp=ListTagsOfResource -ServiceTagsSlice -UpdateTags -Wait -WaitContinuousOccurence 2 -WaitMinTimeout 1s -WaitTimeout 2m -WaitFuncComparator=ContainsAll -ParentNotFoundErrCode=ResourceNotFoundException
+//go:generate go run ../../generate/tags/main.go -GetTag -ListTags -ListTagsOp=ListTagsOfResource -ServiceTagsSlice -UpdateTags -Wait -WaitContinuousOccurence 2 -WaitMinTimeout 1s -WaitTimeout 2m -ParentNotFoundErrCode=ResourceNotFoundException
 //go:generate go run ../../generate/servicepackage/main.go
 //go:generate go run ../../generate/listpages/main.go -ListOps=ListBackups -InputPaginator=ExclusiveStartBackupArn -OutputPaginator=LastEvaluatedBackupArn -- list_backups_pages_gen.go
 //go:generate go run ../../generate/tagstests/main.go

diff --git a/internal/service/dynamodb/tags_gen.go b/internal/service/dynamodb/tags_gen.go