Merge pull request #670 from ernestio/ernest/668

fixes to encrypted values
ernestio · Sep 4, 2017 · 6bab7af · 6bab7af
2 parents 3586e3a + c0fe498
commit 6bab7af
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 39 deletions.
diff --git a/internal/features/aws/add_and_attach_network.feature b/internal/features/aws/add_and_attach_network.feature
@@ -14,12 +14,12 @@ Feature: Environment apply
     And all "network.create.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
     And all "network.create.aws-fake" messages should contain a field "name" with "bknd"
     And all "network.create.aws-fake" messages should contain a field "range" with "10.2.0.0/24"
-    And all "network.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "network.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     Then an event "instance.create.aws-fake" should be called exactly "1" times
     And all "instance.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
-    And all "instance.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "instance.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "instance.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "instance.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And message "instance.create.aws-fake" number "0" should contain "null" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/add_egress_security_group.feature b/internal/features/aws/add_egress_security_group.feature
@@ -11,7 +11,7 @@ Feature: Environment apply
     And I stop recording
     Then an event "firewall.update.aws-fake" should be called exactly "1" times
     And all "firewall.update.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
-    And all "firewall.update.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "firewall.update.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "firewall.update.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "firewall.update.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And all "firewall.update.aws-fake" messages should contain a field "name" with "web-sg-1"

diff --git a/internal/features/aws/add_elb_and_s3.feature b/internal/features/aws/add_elb_and_s3.feature
@@ -13,7 +13,7 @@ Feature: Environment apply
     And all "elb.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "elb.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "elb.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
-    And all "elb.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "elb.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "elb.create.aws-fake" messages should contain a field "name" with "elb-1"
     And message "elb.create.aws-fake" number "0" should contain "web-1" as json field "instance_names.0"
     And message "elb.create.aws-fake" number "0" should contain "foo" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/add_ingress_security_group.feature b/internal/features/aws/add_ingress_security_group.feature
@@ -11,7 +11,7 @@ Feature: Environment apply
     And I stop recording
     Then an event "firewall.update.aws-fake" should be called exactly "1" times
     And all "firewall.update.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
-    And all "firewall.update.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "firewall.update.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "firewall.update.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "firewall.update.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And all "firewall.update.aws-fake" messages should contain a field "name" with "web-sg-1"

diff --git a/internal/features/aws/add_nat_and_attach_a_network.feature b/internal/features/aws/add_nat_and_attach_a_network.feature
@@ -11,7 +11,7 @@ Feature: Environment apply
     And I stop recording
     Then an event "nat.create.aws-fake" should be called exactly "1" times
     And all "nat.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
-    And all "nat.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "nat.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "nat.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "nat.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And all "nat.create.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
@@ -22,6 +22,6 @@ Feature: Environment apply
     And all "network.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "network.create.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
     And all "network.create.aws-fake" messages should contain a field "range" with "10.2.0.0/24"
-    And all "network.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "network.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
diff --git a/internal/features/aws/add_network.feature b/internal/features/aws/add_network.feature
@@ -13,6 +13,6 @@ Feature: Environment apply
     And all "network.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "network.create.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
     And all "network.create.aws-fake" messages should contain a field "range" with "10.2.0.0/24"
-    And all "network.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "network.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
diff --git a/internal/features/aws/add_rds_clusters.feature b/internal/features/aws/add_rds_clusters.feature
@@ -13,7 +13,7 @@ Feature: Environment apply
     And all "rds_cluster.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "rds_cluster.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "rds_cluster.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
-    And all "rds_cluster.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "rds_cluster.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "rds_cluster.create.aws-fake" messages should contain a field "name" with "aurora"
     And all "rds_cluster.create.aws-fake" messages should contain a field "engine" with "aurora"
     And all "rds_cluster.create.aws-fake" messages should contain a field "database_name" with "test"

diff --git a/internal/features/aws/add_rds_instances.feature b/internal/features/aws/add_rds_instances.feature
@@ -13,7 +13,7 @@ Feature: Environment apply
     And all "rds_instance.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "rds_instance.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "rds_instance.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
-    And all "rds_instance.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "rds_instance.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "rds_instance.create.aws-fake" messages should contain a field "name" with "test-1"
     And all "rds_instance.create.aws-fake" messages should contain a field "size" with "db.r3.large"
     And all "rds_instance.create.aws-fake" messages should contain a field "cluster" with "aurora"
diff --git a/internal/features/aws/append_instance_security_group.feature b/internal/features/aws/append_instance_security_group.feature
@@ -11,7 +11,7 @@ Feature: Environment apply
     And I stop recording
     Then an event "instance.update.aws-fake" should be called exactly "1" times
     And all "instance.update.aws-fake" messages should contain a field "_provider" with "aws-fake"
-    And all "instance.update.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "instance.update.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "instance.update.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "instance.update.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And message "instance.update.aws-fake" number "0" should contain "null" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/base.feature b/internal/features/aws/base.feature
@@ -12,12 +12,12 @@ Feature: Environment apply
     And all "network.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "network.create.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
     And all "network.create.aws-fake" messages should contain a field "range" with "10.1.0.0/24"
-    And all "network.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "network.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "network.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     Then an event "firewall.create.aws-fake" should be called exactly "1" times
     And all "firewall.create.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
-    And all "firewall.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "firewall.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "firewall.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "firewall.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And all "firewall.create.aws-fake" messages should contain a field "name" with "web-sg-1"
@@ -28,7 +28,7 @@ Feature: Environment apply
     And message "firewall.create.aws-fake" number "0" should contain "running" as json field "_state"
     Then an event "instance.create.aws-fake" should be called exactly "1" times
     And all "instance.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
-    And all "instance.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "instance.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "instance.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "instance.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And message "instance.create.aws-fake" number "0" should contain "foo" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/decrease_instances_count.feature b/internal/features/aws/decrease_instances_count.feature
@@ -11,7 +11,7 @@ Feature: Environment apply
     And I stop recording
     Then an event "instance.delete.aws-fake" should be called exactly "1" times
     And all "instance.delete.aws-fake" messages should contain a field "_provider" with "aws-fake"
-    And all "instance.delete.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "instance.delete.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "instance.delete.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "instance.delete.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And message "instance.delete.aws-fake" number "0" should contain "foo" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/delete_rds_clusters.feature b/internal/features/aws/delete_rds_clusters.feature
@@ -13,7 +13,7 @@ Feature: Environment apply
     And all "rds_cluster.delete.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "rds_cluster.delete.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "rds_cluster.delete.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
-    And all "rds_cluster.delete.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "rds_cluster.delete.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "rds_cluster.delete.aws-fake" messages should contain a field "name" with "aurora"
     And all "rds_cluster.delete.aws-fake" messages should contain a field "engine" with "aurora"
     And all "rds_cluster.delete.aws-fake" messages should contain a field "database_name" with "test"

diff --git a/internal/features/aws/delete_rds_instances.feature b/internal/features/aws/delete_rds_instances.feature
@@ -13,7 +13,7 @@ Feature: Environment apply
     And all "rds_instance.delete.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "rds_instance.delete.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "rds_instance.delete.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
-    And all "rds_instance.delete.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "rds_instance.delete.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "rds_instance.delete.aws-fake" messages should contain a field "name" with "test-1"
     And all "rds_instance.delete.aws-fake" messages should contain a field "size" with "db.r3.xlarge"
     And all "rds_instance.delete.aws-fake" messages should contain a field "cluster" with "aurora"
diff --git a/internal/features/aws/increment_instances_count.feature b/internal/features/aws/increment_instances_count.feature
@@ -11,7 +11,7 @@ Feature: Environment apply
     And I stop recording
     Then an event "instance.create.aws-fake" should be called exactly "1" times
     And all "instance.create.aws-fake" messages should contain a field "_provider" with "aws-fake"
-    And all "instance.create.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "instance.create.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "instance.create.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "instance.create.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And message "instance.create.aws-fake" number "0" should contain "foo" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/remove_and_dettach_network.feature b/internal/features/aws/remove_and_dettach_network.feature
@@ -13,12 +13,12 @@ Feature: Environment apply
     And all "network.delete.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "network.delete.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
     And all "network.delete.aws-fake" messages should contain a field "range" with "10.2.0.0/24"
-    And all "network.delete.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "network.delete.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "network.delete.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "network.delete.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     Then an event "instance.delete.aws-fake" should be called exactly "1" times
     And all "instance.delete.aws-fake" messages should contain a field "_provider" with "aws-fake"
-    And all "instance.delete.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "instance.delete.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "instance.delete.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "instance.delete.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And message "instance.delete.aws-fake" number "0" should contain "null" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/remove_elb_and_s3.feature b/internal/features/aws/remove_elb_and_s3.feature
@@ -13,7 +13,7 @@ Feature: Environment apply
     And all "elb.delete.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "elb.delete.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "elb.delete.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
-    And all "elb.delete.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "elb.delete.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "elb.delete.aws-fake" messages should contain a field "name" with "elb-1"
     And message "elb.delete.aws-fake" number "0" should contain "web-1" as json field "instance_names.0"
     And message "elb.delete.aws-fake" number "0" should contain "foo" as json field "security_group_aws_ids.0"

diff --git a/internal/features/aws/remove_network.feature b/internal/features/aws/remove_network.feature
@@ -13,6 +13,6 @@ Feature: Environment apply
     And all "network.delete.aws-fake" messages should contain a field "_provider" with "aws-fake"
     And all "network.delete.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
     And all "network.delete.aws-fake" messages should contain a field "range" with "10.2.0.0/24"
-    And all "network.delete.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "network.delete.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "network.delete.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "network.delete.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
diff --git a/internal/features/aws/remove_security_groups.feature b/internal/features/aws/remove_security_groups.feature
@@ -11,7 +11,7 @@ Feature: Environment apply
     And I stop recording
     Then an event "firewall.update.aws-fake" should be called exactly "1" times
     And all "firewall.update.aws-fake" messages should contain a field "vpc_id" with "fakeaws"
-    And all "firewall.update.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake"
+    And all "firewall.update.aws-fake" messages should contain a field "datacenter_region" with "fake"
     And all "firewall.update.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret"
     And all "firewall.update.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters"
     And all "firewall.update.aws-fake" messages should contain a field "name" with "web-sg-1"