Skip to content

Fix adding labels/annotations to resources or data to config maps/secrets when those were empty #116

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

Merged
merged 5 commits into from
Mar 1, 2018
Merged

Fix adding labels/annotations to resources or data to config maps/secrets when those were empty #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f060690
Add test case revealing issue #115 when adding labels to a resource t…
pdecat Feb 12, 2018
cc09e9a
Add test case revealing issue #115 when adding annotations to a resou…
pdecat Feb 12, 2018
9744f20
Fix adding labels and annotations to a resource that didn't have any
pdecat Feb 12, 2018
784924a
Add test case revealing issue #115 when adding data to a config map r…
pdecat Feb 12, 2018
ec458f0
Add test case revealing issue #115 when adding data to a secret resou…
pdecat Feb 12, 2018
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
9 changes: 9 additions & 0 deletions kubernetes/patch_operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ func diffStringMap(pathPrefix string, oldV, newV map[string]interface{}) PatchOp

pathPrefix = strings.TrimRight(pathPrefix, "/")

// If old value was empty, just create the object
if len(oldV) == 0 {
ops = append(ops, &AddOperation{
Path: pathPrefix,
Value: newV,
})
return ops
}

// This is suboptimal for adding whole new map from scratch
// or deleting the whole map, but it's actually intention.
// There may be some other map items managed outside of TF
Expand Down
11 changes: 5 additions & 6 deletions kubernetes/patch_operations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,11 @@ func TestDiffStringMap(t *testing.T) {
},
ExpectedOps: []PatchOperation{
&AddOperation{
Path: "/parent/one",
Value: "111",
},
&AddOperation{
Path: "/parent/two",
Value: "222",
Path: "/parent",
Value: map[string]interface{}{
"one": "111",
"two": "222",
},
},
},
},
Expand Down
40 changes: 40 additions & 0 deletions kubernetes/resource_kubernetes_config_map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,27 @@ func TestAccKubernetesConfigMap_basic(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckKubernetesConfigMapDestroy,
Steps: []resource.TestStep{
{
Config: testAccKubernetesConfigMapConfig_nodata(name),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesConfigMapExists("kubernetes_config_map.test", &conf),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.annotations.%", "2"),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.annotations.TestAnnotationOne", "one"),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.annotations.TestAnnotationTwo", "two"),
testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"TestAnnotationOne": "one", "TestAnnotationTwo": "two"}),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.labels.%", "3"),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.labels.TestLabelOne", "one"),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.labels.TestLabelTwo", "two"),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.labels.TestLabelThree", "three"),
testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{"TestLabelOne": "one", "TestLabelTwo": "two", "TestLabelThree": "three"}),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "metadata.0.name", name),
resource.TestCheckResourceAttrSet("kubernetes_config_map.test", "metadata.0.generation"),
resource.TestCheckResourceAttrSet("kubernetes_config_map.test", "metadata.0.resource_version"),
resource.TestCheckResourceAttrSet("kubernetes_config_map.test", "metadata.0.self_link"),
resource.TestCheckResourceAttrSet("kubernetes_config_map.test", "metadata.0.uid"),
resource.TestCheckResourceAttr("kubernetes_config_map.test", "data.%", "0"),
),
},
{
Config: testAccKubernetesConfigMapConfig_basic(name),
Check: resource.ComposeAggregateTestCheckFunc(
Expand Down Expand Up @@ -224,6 +245,25 @@ func testAccCheckKubernetesConfigMapExists(n string, obj *api.ConfigMap) resourc
}
}

func testAccKubernetesConfigMapConfig_nodata(name string) string {
return fmt.Sprintf(`
resource "kubernetes_config_map" "test" {
metadata {
annotations {
TestAnnotationOne = "one"
TestAnnotationTwo = "two"
}
labels {
TestLabelOne = "one"
TestLabelTwo = "two"
TestLabelThree = "three"
}
name = "%s"
}
data {}
}`, name)
}

func testAccKubernetesConfigMapConfig_basic(name string) string {
return fmt.Sprintf(`
resource "kubernetes_config_map" "test" {
Expand Down
50 changes: 50 additions & 0 deletions kubernetes/resource_kubernetes_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,35 @@ func TestAccKubernetesNamespace_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccKubernetesNamespaceConfig_basic(nsName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesNamespaceExists("kubernetes_namespace.test", &conf),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.annotations.%", "0"),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.labels.%", "0"),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.name", nsName),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.generation"),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.resource_version"),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.self_link"),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.uid"),
),
},
{
Config: testAccKubernetesNamespaceConfig_addAnnotations(nsName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesNamespaceExists("kubernetes_namespace.test", &conf),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.annotations.%", "2"),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.annotations.TestAnnotationOne", "one"),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.annotations.TestAnnotationTwo", "two"),
testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"TestAnnotationOne": "one", "TestAnnotationTwo": "two"}),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.labels.%", "0"),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.name", nsName),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.generation"),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.resource_version"),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.self_link"),
resource.TestCheckResourceAttrSet("kubernetes_namespace.test", "metadata.0.uid"),
),
},
{
Config: testAccKubernetesNamespaceConfig_addLabels(nsName),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesNamespaceExists("kubernetes_namespace.test", &conf),
resource.TestCheckResourceAttr("kubernetes_namespace.test", "metadata.0.annotations.%", "2"),
Expand Down Expand Up @@ -260,6 +289,27 @@ func testAccCheckKubernetesNamespaceExists(n string, obj *api.Namespace) resourc

func testAccKubernetesNamespaceConfig_basic(nsName string) string {
return fmt.Sprintf(`
resource "kubernetes_namespace" "test" {
metadata {
name = "%s"
}
}`, nsName)
}

func testAccKubernetesNamespaceConfig_addAnnotations(nsName string) string {
return fmt.Sprintf(`
resource "kubernetes_namespace" "test" {
metadata {
annotations {
TestAnnotationOne = "one"
TestAnnotationTwo = "two"
}
name = "%s"
}
}`, nsName)
}
func testAccKubernetesNamespaceConfig_addLabels(nsName string) string {
return fmt.Sprintf(`
resource "kubernetes_namespace" "test" {
metadata {
annotations {
Expand Down
41 changes: 41 additions & 0 deletions kubernetes/resource_kubernetes_secret_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,28 @@ func TestAccKubernetesSecret_basic(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckKubernetesSecretDestroy,
Steps: []resource.TestStep{
{
Config: testAccKubernetesSecretConfig_emptyData(name),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckKubernetesSecretExists("kubernetes_secret.test", &conf),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.annotations.%", "2"),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.annotations.TestAnnotationOne", "one"),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.annotations.TestAnnotationTwo", "two"),
testAccCheckMetaAnnotations(&conf.ObjectMeta, map[string]string{"TestAnnotationOne": "one", "TestAnnotationTwo": "two"}),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.labels.%", "3"),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.labels.TestLabelOne", "one"),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.labels.TestLabelTwo", "two"),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.labels.TestLabelThree", "three"),
testAccCheckMetaLabels(&conf.ObjectMeta, map[string]string{"TestLabelOne": "one", "TestLabelTwo": "two", "TestLabelThree": "three"}),
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.name", name),
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.generation"),
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.resource_version"),
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.self_link"),
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.uid"),
resource.TestCheckResourceAttr("kubernetes_secret.test", "data.%", "0"),
resource.TestCheckResourceAttr("kubernetes_secret.test", "type", "Opaque"),
),
},
{
Config: testAccKubernetesSecretConfig_basic(name),
Check: resource.ComposeAggregateTestCheckFunc(
Expand Down Expand Up @@ -250,6 +272,25 @@ func testAccCheckKubernetesSecretExists(n string, obj *api.Secret) resource.Test
}
}

func testAccKubernetesSecretConfig_emptyData(name string) string {
return fmt.Sprintf(`
resource "kubernetes_secret" "test" {
metadata {
annotations {
TestAnnotationOne = "one"
TestAnnotationTwo = "two"
}
labels {
TestLabelOne = "one"
TestLabelTwo = "two"
TestLabelThree = "three"
}
name = "%s"
}
data {}
}`, name)
}

func testAccKubernetesSecretConfig_basic(name string) string {
return fmt.Sprintf(`
resource "kubernetes_secret" "test" {
Expand Down