Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add comparison support for blob type fields #171

Merged
merged 1 commit into from
Aug 26, 2021
Merged

Add comparison support for blob type fields #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/generate/code/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,11 @@ func compareScalar(
"%sif *%s != *%s {\n",
indent, firstResVarName, secondResVarName,
)
case "blob":
out += fmt.Sprintf(
"%sif !bytes.Equal(%s, %s) {\n",
indent, firstResVarName, secondResVarName,
)
case "timestamp":
// if !a.ko.Spec.CreatedAt.Equal(b.ko.Spec.CreatedAt) {
out += fmt.Sprintf(
Expand Down
204 changes: 204 additions & 0 deletions pkg/generate/code/compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,207 @@ func TestCompareResource_Lambda_CodeSigningConfig(t *testing.T) {
),
)
}

func TestCompareResource_Lambda_Function(t *testing.T) {
assert := assert.New(t)
require := require.New(t)

g := testutil.NewModelForService(t, "lambda")

crd := testutil.GetCRDByName(t, g, "Function")
require.NotNil(crd)

expected := `
if ackcompare.HasNilDifference(a.ko.Spec.Code, b.ko.Spec.Code) {
delta.Add("Spec.Code", a.ko.Spec.Code, b.ko.Spec.Code)
} else if a.ko.Spec.Code != nil && b.ko.Spec.Code != nil {
if ackcompare.HasNilDifference(a.ko.Spec.Code.ImageURI, b.ko.Spec.Code.ImageURI) {
delta.Add("Spec.Code.ImageURI", a.ko.Spec.Code.ImageURI, b.ko.Spec.Code.ImageURI)
} else if a.ko.Spec.Code.ImageURI != nil && b.ko.Spec.Code.ImageURI != nil {
if *a.ko.Spec.Code.ImageURI != *b.ko.Spec.Code.ImageURI {
delta.Add("Spec.Code.ImageURI", a.ko.Spec.Code.ImageURI, b.ko.Spec.Code.ImageURI)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Code.S3Bucket, b.ko.Spec.Code.S3Bucket) {
delta.Add("Spec.Code.S3Bucket", a.ko.Spec.Code.S3Bucket, b.ko.Spec.Code.S3Bucket)
} else if a.ko.Spec.Code.S3Bucket != nil && b.ko.Spec.Code.S3Bucket != nil {
if *a.ko.Spec.Code.S3Bucket != *b.ko.Spec.Code.S3Bucket {
delta.Add("Spec.Code.S3Bucket", a.ko.Spec.Code.S3Bucket, b.ko.Spec.Code.S3Bucket)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Code.S3Key, b.ko.Spec.Code.S3Key) {
delta.Add("Spec.Code.S3Key", a.ko.Spec.Code.S3Key, b.ko.Spec.Code.S3Key)
} else if a.ko.Spec.Code.S3Key != nil && b.ko.Spec.Code.S3Key != nil {
if *a.ko.Spec.Code.S3Key != *b.ko.Spec.Code.S3Key {
delta.Add("Spec.Code.S3Key", a.ko.Spec.Code.S3Key, b.ko.Spec.Code.S3Key)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Code.S3ObjectVersion, b.ko.Spec.Code.S3ObjectVersion) {
delta.Add("Spec.Code.S3ObjectVersion", a.ko.Spec.Code.S3ObjectVersion, b.ko.Spec.Code.S3ObjectVersion)
} else if a.ko.Spec.Code.S3ObjectVersion != nil && b.ko.Spec.Code.S3ObjectVersion != nil {
if *a.ko.Spec.Code.S3ObjectVersion != *b.ko.Spec.Code.S3ObjectVersion {
delta.Add("Spec.Code.S3ObjectVersion", a.ko.Spec.Code.S3ObjectVersion, b.ko.Spec.Code.S3ObjectVersion)
}
}
if !bytes.Equal(a.ko.Spec.Code.ZipFile, b.ko.Spec.Code.ZipFile) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

(even though it's probably not a great idea for us to support ZipFile field the Function CRD, but that's a conversation for another day ;) )

delta.Add("Spec.Code.ZipFile", a.ko.Spec.Code.ZipFile, b.ko.Spec.Code.ZipFile)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.CodeSigningConfigARN, b.ko.Spec.CodeSigningConfigARN) {
delta.Add("Spec.CodeSigningConfigARN", a.ko.Spec.CodeSigningConfigARN, b.ko.Spec.CodeSigningConfigARN)
} else if a.ko.Spec.CodeSigningConfigARN != nil && b.ko.Spec.CodeSigningConfigARN != nil {
if *a.ko.Spec.CodeSigningConfigARN != *b.ko.Spec.CodeSigningConfigARN {
delta.Add("Spec.CodeSigningConfigARN", a.ko.Spec.CodeSigningConfigARN, b.ko.Spec.CodeSigningConfigARN)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.DeadLetterConfig, b.ko.Spec.DeadLetterConfig) {
delta.Add("Spec.DeadLetterConfig", a.ko.Spec.DeadLetterConfig, b.ko.Spec.DeadLetterConfig)
} else if a.ko.Spec.DeadLetterConfig != nil && b.ko.Spec.DeadLetterConfig != nil {
if ackcompare.HasNilDifference(a.ko.Spec.DeadLetterConfig.TargetARN, b.ko.Spec.DeadLetterConfig.TargetARN) {
delta.Add("Spec.DeadLetterConfig.TargetARN", a.ko.Spec.DeadLetterConfig.TargetARN, b.ko.Spec.DeadLetterConfig.TargetARN)
} else if a.ko.Spec.DeadLetterConfig.TargetARN != nil && b.ko.Spec.DeadLetterConfig.TargetARN != nil {
if *a.ko.Spec.DeadLetterConfig.TargetARN != *b.ko.Spec.DeadLetterConfig.TargetARN {
delta.Add("Spec.DeadLetterConfig.TargetARN", a.ko.Spec.DeadLetterConfig.TargetARN, b.ko.Spec.DeadLetterConfig.TargetARN)
}
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Description, b.ko.Spec.Description) {
delta.Add("Spec.Description", a.ko.Spec.Description, b.ko.Spec.Description)
} else if a.ko.Spec.Description != nil && b.ko.Spec.Description != nil {
if *a.ko.Spec.Description != *b.ko.Spec.Description {
delta.Add("Spec.Description", a.ko.Spec.Description, b.ko.Spec.Description)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Environment, b.ko.Spec.Environment) {
delta.Add("Spec.Environment", a.ko.Spec.Environment, b.ko.Spec.Environment)
} else if a.ko.Spec.Environment != nil && b.ko.Spec.Environment != nil {
if ackcompare.HasNilDifference(a.ko.Spec.Environment.Variables, b.ko.Spec.Environment.Variables) {
delta.Add("Spec.Environment.Variables", a.ko.Spec.Environment.Variables, b.ko.Spec.Environment.Variables)
} else if a.ko.Spec.Environment.Variables != nil && b.ko.Spec.Environment.Variables != nil {
if !ackcompare.MapStringStringPEqual(a.ko.Spec.Environment.Variables, b.ko.Spec.Environment.Variables) {
delta.Add("Spec.Environment.Variables", a.ko.Spec.Environment.Variables, b.ko.Spec.Environment.Variables)
}
}
}
if !reflect.DeepEqual(a.ko.Spec.FileSystemConfigs, b.ko.Spec.FileSystemConfigs) {
delta.Add("Spec.FileSystemConfigs", a.ko.Spec.FileSystemConfigs, b.ko.Spec.FileSystemConfigs)
}
if ackcompare.HasNilDifference(a.ko.Spec.FunctionName, b.ko.Spec.FunctionName) {
delta.Add("Spec.FunctionName", a.ko.Spec.FunctionName, b.ko.Spec.FunctionName)
} else if a.ko.Spec.FunctionName != nil && b.ko.Spec.FunctionName != nil {
if *a.ko.Spec.FunctionName != *b.ko.Spec.FunctionName {
delta.Add("Spec.FunctionName", a.ko.Spec.FunctionName, b.ko.Spec.FunctionName)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Handler, b.ko.Spec.Handler) {
delta.Add("Spec.Handler", a.ko.Spec.Handler, b.ko.Spec.Handler)
} else if a.ko.Spec.Handler != nil && b.ko.Spec.Handler != nil {
if *a.ko.Spec.Handler != *b.ko.Spec.Handler {
delta.Add("Spec.Handler", a.ko.Spec.Handler, b.ko.Spec.Handler)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.ImageConfig, b.ko.Spec.ImageConfig) {
delta.Add("Spec.ImageConfig", a.ko.Spec.ImageConfig, b.ko.Spec.ImageConfig)
} else if a.ko.Spec.ImageConfig != nil && b.ko.Spec.ImageConfig != nil {
if !ackcompare.SliceStringPEqual(a.ko.Spec.ImageConfig.Command, b.ko.Spec.ImageConfig.Command) {
delta.Add("Spec.ImageConfig.Command", a.ko.Spec.ImageConfig.Command, b.ko.Spec.ImageConfig.Command)
}
if !ackcompare.SliceStringPEqual(a.ko.Spec.ImageConfig.EntryPoint, b.ko.Spec.ImageConfig.EntryPoint) {
delta.Add("Spec.ImageConfig.EntryPoint", a.ko.Spec.ImageConfig.EntryPoint, b.ko.Spec.ImageConfig.EntryPoint)
}
if ackcompare.HasNilDifference(a.ko.Spec.ImageConfig.WorkingDirectory, b.ko.Spec.ImageConfig.WorkingDirectory) {
delta.Add("Spec.ImageConfig.WorkingDirectory", a.ko.Spec.ImageConfig.WorkingDirectory, b.ko.Spec.ImageConfig.WorkingDirectory)
} else if a.ko.Spec.ImageConfig.WorkingDirectory != nil && b.ko.Spec.ImageConfig.WorkingDirectory != nil {
if *a.ko.Spec.ImageConfig.WorkingDirectory != *b.ko.Spec.ImageConfig.WorkingDirectory {
delta.Add("Spec.ImageConfig.WorkingDirectory", a.ko.Spec.ImageConfig.WorkingDirectory, b.ko.Spec.ImageConfig.WorkingDirectory)
}
}
}
if ackcompare.HasNilDifference(a.ko.Spec.KMSKeyARN, b.ko.Spec.KMSKeyARN) {
delta.Add("Spec.KMSKeyARN", a.ko.Spec.KMSKeyARN, b.ko.Spec.KMSKeyARN)
} else if a.ko.Spec.KMSKeyARN != nil && b.ko.Spec.KMSKeyARN != nil {
if *a.ko.Spec.KMSKeyARN != *b.ko.Spec.KMSKeyARN {
delta.Add("Spec.KMSKeyARN", a.ko.Spec.KMSKeyARN, b.ko.Spec.KMSKeyARN)
}
}
if !ackcompare.SliceStringPEqual(a.ko.Spec.Layers, b.ko.Spec.Layers) {
delta.Add("Spec.Layers", a.ko.Spec.Layers, b.ko.Spec.Layers)
}
if ackcompare.HasNilDifference(a.ko.Spec.MemorySize, b.ko.Spec.MemorySize) {
delta.Add("Spec.MemorySize", a.ko.Spec.MemorySize, b.ko.Spec.MemorySize)
} else if a.ko.Spec.MemorySize != nil && b.ko.Spec.MemorySize != nil {
if *a.ko.Spec.MemorySize != *b.ko.Spec.MemorySize {
delta.Add("Spec.MemorySize", a.ko.Spec.MemorySize, b.ko.Spec.MemorySize)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.PackageType, b.ko.Spec.PackageType) {
delta.Add("Spec.PackageType", a.ko.Spec.PackageType, b.ko.Spec.PackageType)
} else if a.ko.Spec.PackageType != nil && b.ko.Spec.PackageType != nil {
if *a.ko.Spec.PackageType != *b.ko.Spec.PackageType {
delta.Add("Spec.PackageType", a.ko.Spec.PackageType, b.ko.Spec.PackageType)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Publish, b.ko.Spec.Publish) {
delta.Add("Spec.Publish", a.ko.Spec.Publish, b.ko.Spec.Publish)
} else if a.ko.Spec.Publish != nil && b.ko.Spec.Publish != nil {
if *a.ko.Spec.Publish != *b.ko.Spec.Publish {
delta.Add("Spec.Publish", a.ko.Spec.Publish, b.ko.Spec.Publish)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Role, b.ko.Spec.Role) {
delta.Add("Spec.Role", a.ko.Spec.Role, b.ko.Spec.Role)
} else if a.ko.Spec.Role != nil && b.ko.Spec.Role != nil {
if *a.ko.Spec.Role != *b.ko.Spec.Role {
delta.Add("Spec.Role", a.ko.Spec.Role, b.ko.Spec.Role)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Runtime, b.ko.Spec.Runtime) {
delta.Add("Spec.Runtime", a.ko.Spec.Runtime, b.ko.Spec.Runtime)
} else if a.ko.Spec.Runtime != nil && b.ko.Spec.Runtime != nil {
if *a.ko.Spec.Runtime != *b.ko.Spec.Runtime {
delta.Add("Spec.Runtime", a.ko.Spec.Runtime, b.ko.Spec.Runtime)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Tags, b.ko.Spec.Tags) {
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
} else if a.ko.Spec.Tags != nil && b.ko.Spec.Tags != nil {
if !ackcompare.MapStringStringPEqual(a.ko.Spec.Tags, b.ko.Spec.Tags) {
delta.Add("Spec.Tags", a.ko.Spec.Tags, b.ko.Spec.Tags)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.Timeout, b.ko.Spec.Timeout) {
delta.Add("Spec.Timeout", a.ko.Spec.Timeout, b.ko.Spec.Timeout)
} else if a.ko.Spec.Timeout != nil && b.ko.Spec.Timeout != nil {
if *a.ko.Spec.Timeout != *b.ko.Spec.Timeout {
delta.Add("Spec.Timeout", a.ko.Spec.Timeout, b.ko.Spec.Timeout)
}
}
if ackcompare.HasNilDifference(a.ko.Spec.TracingConfig, b.ko.Spec.TracingConfig) {
delta.Add("Spec.TracingConfig", a.ko.Spec.TracingConfig, b.ko.Spec.TracingConfig)
} else if a.ko.Spec.TracingConfig != nil && b.ko.Spec.TracingConfig != nil {
if ackcompare.HasNilDifference(a.ko.Spec.TracingConfig.Mode, b.ko.Spec.TracingConfig.Mode) {
delta.Add("Spec.TracingConfig.Mode", a.ko.Spec.TracingConfig.Mode, b.ko.Spec.TracingConfig.Mode)
} else if a.ko.Spec.TracingConfig.Mode != nil && b.ko.Spec.TracingConfig.Mode != nil {
if *a.ko.Spec.TracingConfig.Mode != *b.ko.Spec.TracingConfig.Mode {
delta.Add("Spec.TracingConfig.Mode", a.ko.Spec.TracingConfig.Mode, b.ko.Spec.TracingConfig.Mode)
}
}
}
if ackcompare.HasNilDifference(a.ko.Spec.VPCConfig, b.ko.Spec.VPCConfig) {
delta.Add("Spec.VPCConfig", a.ko.Spec.VPCConfig, b.ko.Spec.VPCConfig)
} else if a.ko.Spec.VPCConfig != nil && b.ko.Spec.VPCConfig != nil {
if !ackcompare.SliceStringPEqual(a.ko.Spec.VPCConfig.SecurityGroupIDs, b.ko.Spec.VPCConfig.SecurityGroupIDs) {
delta.Add("Spec.VPCConfig.SecurityGroupIDs", a.ko.Spec.VPCConfig.SecurityGroupIDs, b.ko.Spec.VPCConfig.SecurityGroupIDs)
}
if !ackcompare.SliceStringPEqual(a.ko.Spec.VPCConfig.SubnetIDs, b.ko.Spec.VPCConfig.SubnetIDs) {
delta.Add("Spec.VPCConfig.SubnetIDs", a.ko.Spec.VPCConfig.SubnetIDs, b.ko.Spec.VPCConfig.SubnetIDs)
}
}
`
assert.Equal(
expected,
code.CompareResource(
crd.Config(), crd, "delta", "a.ko", "b.ko", 1,
),
)
}
2 changes: 1 addition & 1 deletion pkg/model/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ func (m *Model) getShapeCleanGoType(shape *awssdkmodel.Shape) string {
// If it's a map type we need to set the GoType to the cleaned-up
// Camel-cased name
return "map[string]" + m.getShapeCleanGoType(shape.ValueRef.Shape)
case "list", "array", "blob":
case "list", "array":
// If it's a list type, we need to set the GoType to the cleaned-up
// Camel-cased name
return "[]" + m.getShapeCleanGoType(shape.MemberRef.Shape)
Expand Down
2 changes: 2 additions & 0 deletions templates/pkg/resource/delta.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
package {{ .CRD.Names.Snake }}

import (
"bytes"
"reflect"

ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
)

// Hack to avoid import errors during build...
var (
_ = &bytes.Buffer{}
_ = &reflect.Method{}
)

Expand Down