From c0fe4982839b48dbbe7589bb79c72b4739ae845e Mon Sep 17 00:00:00 2001 From: Tom Bevan Date: Mon, 4 Sep 2017 12:22:06 +0100 Subject: [PATCH] fixes to encrypted values --- internal/features/aws/add_and_attach_network.feature | 4 ++-- internal/features/aws/add_egress_security_group.feature | 2 +- internal/features/aws/add_elb_and_s3.feature | 2 +- internal/features/aws/add_ingress_security_group.feature | 2 +- internal/features/aws/add_nat_and_attach_a_network.feature | 4 ++-- internal/features/aws/add_network.feature | 2 +- internal/features/aws/add_rds_clusters.feature | 2 +- internal/features/aws/add_rds_instances.feature | 2 +- .../features/aws/append_instance_security_group.feature | 2 +- internal/features/aws/base.feature | 6 +++--- internal/features/aws/decrease_instances_count.feature | 2 +- internal/features/aws/delete_rds_clusters.feature | 2 +- internal/features/aws/delete_rds_instances.feature | 2 +- internal/features/aws/increment_instances_count.feature | 2 +- internal/features/aws/remove_and_dettach_network.feature | 4 ++-- internal/features/aws/remove_elb_and_s3.feature | 2 +- internal/features/aws/remove_network.feature | 2 +- internal/features/aws/remove_security_groups.feature | 2 +- internal/features/aws/update_elb_and_s3.feature | 2 +- internal/features/aws/update_rds_clusters.feature | 2 +- internal/features/aws/update_rds_instances.feature | 2 +- internal/features/vcloud/add_and_attach_network.feature | 4 ++-- internal/features/vcloud/base.feature | 6 +++--- internal/features/vcloud/decrease_instances_count.feature | 2 +- internal/features/vcloud/increase_instances_count.feature | 2 +- internal/features/vcloud/instance_only.feature | 2 +- internal/features/vcloud/remove_and_dettach_network.feature | 4 ++-- internal/features/vcloud/update_firewall_rules.feature | 2 +- internal/features/vcloud/update_instances_resource.feature | 2 +- internal/features/vcloud/update_nat_rules.feature | 2 +- 30 files changed, 39 insertions(+), 39 deletions(-) diff --git a/internal/features/aws/add_and_attach_network.feature b/internal/features/aws/add_and_attach_network.feature index e4b8545..eed8053 100644 --- 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 index 413afae..fdc824d 100644 --- 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 index b0cb1e5..8a5478d 100644 --- 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 index 48e965a..0c51332 100644 --- 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 index 65920e5..12020bf 100644 --- 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 index 4abf741..0190446 100644 --- 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 index 1d678d0..650044a 100644 --- 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 index 398b608..6b6e815 100644 --- 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 index 04a8796..2467b0f 100644 --- 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 index ce39e4b..dc81814 100644 --- 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 index e28d6b8..e3c30af 100644 --- 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 index 1bad0e5..3a67494 100644 --- 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 index d0f56f6..ebee527 100644 --- 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 index e8db121..af30a82 100644 --- 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 index 06e6141..c93d713 100644 --- 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 index a9de608..5bc9af2 100644 --- 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 index acfeac2..405673e 100644 --- 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 index f625df5..6ac7b55 100644 --- 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" diff --git a/internal/features/aws/update_elb_and_s3.feature b/internal/features/aws/update_elb_and_s3.feature index bc935f7..5db1ebf 100644 --- a/internal/features/aws/update_elb_and_s3.feature +++ b/internal/features/aws/update_elb_and_s3.feature @@ -13,7 +13,7 @@ Feature: Environment apply And all "elb.update.aws-fake" messages should contain a field "_provider" with "aws-fake" And all "elb.update.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret" And all "elb.update.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters" - And all "elb.update.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake" + And all "elb.update.aws-fake" messages should contain a field "datacenter_region" with "fake" And all "elb.update.aws-fake" messages should contain a field "name" with "elb-1" And message "elb.update.aws-fake" number "0" should contain "web-1" as json field "instance_names.0" And message "elb.update.aws-fake" number "0" should contain "foo" as json field "security_group_aws_ids.0" diff --git a/internal/features/aws/update_rds_clusters.feature b/internal/features/aws/update_rds_clusters.feature index 60588bd..f15fe79 100644 --- a/internal/features/aws/update_rds_clusters.feature +++ b/internal/features/aws/update_rds_clusters.feature @@ -13,7 +13,7 @@ Feature: Environment apply And all "rds_cluster.update.aws-fake" messages should contain a field "_provider" with "aws-fake" And all "rds_cluster.update.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret" And all "rds_cluster.update.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters" - And all "rds_cluster.update.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake" + And all "rds_cluster.update.aws-fake" messages should contain a field "datacenter_region" with "fake" And all "rds_cluster.update.aws-fake" messages should contain a field "name" with "aurora" And all "rds_cluster.update.aws-fake" messages should contain a field "engine" with "aurora" And all "rds_cluster.update.aws-fake" messages should contain a field "database_name" with "test" diff --git a/internal/features/aws/update_rds_instances.feature b/internal/features/aws/update_rds_instances.feature index 053590f..1808cd5 100644 --- a/internal/features/aws/update_rds_instances.feature +++ b/internal/features/aws/update_rds_instances.feature @@ -13,7 +13,7 @@ Feature: Environment apply And all "rds_instance.update.aws-fake" messages should contain a field "_provider" with "aws-fake" And all "rds_instance.update.aws-fake" messages should contain an encrypted field "aws_access_key_id" with "up_to_16_characters_secret" And all "rds_instance.update.aws-fake" messages should contain an encrypted field "aws_secret_access_key" with "fake_up_to_16_characters" - And all "rds_instance.update.aws-fake" messages should contain an encrypted field "datacenter_region" with "fake" + And all "rds_instance.update.aws-fake" messages should contain a field "datacenter_region" with "fake" And all "rds_instance.update.aws-fake" messages should contain a field "name" with "test-1" And all "rds_instance.update.aws-fake" messages should contain a field "size" with "db.r3.xlarge" And all "rds_instance.update.aws-fake" messages should contain a field "cluster" with "aurora" diff --git a/internal/features/vcloud/add_and_attach_network.feature b/internal/features/vcloud/add_and_attach_network.feature index 2614ee4..aa7123a 100644 --- a/internal/features/vcloud/add_and_attach_network.feature +++ b/internal/features/vcloud/add_and_attach_network.feature @@ -13,12 +13,12 @@ Feature: Environment apply And all "network.create.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "network.create.vcloud-fake" messages should contain a field "range" with "10.1.0.0/24" And all "network.create.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "network.create.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "network.create.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "network.create.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "network.create.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" Then an event "instance.create.vcloud-fake" should be called exactly "1" times And all "instance.create.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" - And all "instance.create.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "instance.create.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "instance.create.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" diff --git a/internal/features/vcloud/base.feature b/internal/features/vcloud/base.feature index f0681ef..99a2f56 100644 --- a/internal/features/vcloud/base.feature +++ b/internal/features/vcloud/base.feature @@ -12,7 +12,7 @@ Feature: Environment apply And all "router.create.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "router.create.vcloud-fake" messages should contain a field "name" with "vse2" And all "router.create.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "router.create.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "router.create.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "router.create.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "router.create.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And message "router.create.vcloud-fake" number "0" should contain "in_in_any" as json field "firewall_rules.0.name" @@ -48,13 +48,13 @@ Feature: Environment apply Then an event "network.create.vcloud-fake" should be called exactly "1" times And all "network.create.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "network.create.vcloud-fake" messages should contain a field "range" with "10.1.0.0/24" - And all "network.create.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "network.create.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "network.create.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" And all "network.create.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "network.create.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" Then an event "instance.create.vcloud-fake" should be called exactly "1" times And all "instance.create.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" - And all "instance.create.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "instance.create.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "instance.create.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" diff --git a/internal/features/vcloud/decrease_instances_count.feature b/internal/features/vcloud/decrease_instances_count.feature index 71e0c43..d2320d1 100644 --- a/internal/features/vcloud/decrease_instances_count.feature +++ b/internal/features/vcloud/decrease_instances_count.feature @@ -12,7 +12,7 @@ Feature: Environment apply Then an event "instance.delete.vcloud-fake" should be called exactly "1" times And all "instance.delete.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "instance.delete.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "instance.delete.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "instance.delete.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "instance.delete.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "instance.delete.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And all "instance.delete.vcloud-fake" messages should contain a field "name" with "web-2" diff --git a/internal/features/vcloud/increase_instances_count.feature b/internal/features/vcloud/increase_instances_count.feature index 51f77f0..8084578 100644 --- a/internal/features/vcloud/increase_instances_count.feature +++ b/internal/features/vcloud/increase_instances_count.feature @@ -12,7 +12,7 @@ Feature: Environment apply Then an event "instance.create.vcloud-fake" should be called exactly "1" times And all "instance.create.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "instance.create.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "instance.create.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "instance.create.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And all "instance.create.vcloud-fake" messages should contain a field "name" with "web-2" diff --git a/internal/features/vcloud/instance_only.feature b/internal/features/vcloud/instance_only.feature index a4c8d16..cf11fda 100644 --- a/internal/features/vcloud/instance_only.feature +++ b/internal/features/vcloud/instance_only.feature @@ -11,7 +11,7 @@ Feature: Environment apply Then an event "instance.create.vcloud-fake" should be called exactly "1" times And all "instance.create.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "instance.create.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "instance.create.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "instance.create.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "instance.create.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And all "instance.create.vcloud-fake" messages should contain a field "name" with "web-1" diff --git a/internal/features/vcloud/remove_and_dettach_network.feature b/internal/features/vcloud/remove_and_dettach_network.feature index b9f44dd..bdd34c9 100644 --- a/internal/features/vcloud/remove_and_dettach_network.feature +++ b/internal/features/vcloud/remove_and_dettach_network.feature @@ -12,7 +12,7 @@ Feature: Environment apply Then an event "instance.delete.vcloud-fake" should be called exactly "1" times And all "instance.delete.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "instance.delete.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "instance.delete.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "instance.delete.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "instance.delete.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "instance.delete.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And all "instance.delete.vcloud-fake" messages should contain a field "name" with "web-1" @@ -27,6 +27,6 @@ Feature: Environment apply And all "network.delete.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "network.delete.vcloud-fake" messages should contain a field "range" with "10.1.0.0/24" And all "network.delete.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "network.delete.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "network.delete.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "network.delete.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "network.delete.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" diff --git a/internal/features/vcloud/update_firewall_rules.feature b/internal/features/vcloud/update_firewall_rules.feature index 7fbb8cb..998791b 100644 --- a/internal/features/vcloud/update_firewall_rules.feature +++ b/internal/features/vcloud/update_firewall_rules.feature @@ -13,7 +13,7 @@ Feature: Environment apply And all "router.update.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "router.update.vcloud-fake" messages should contain a field "name" with "vse2" And all "router.update.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "router.update.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "router.update.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "router.update.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "router.update.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And message "router.update.vcloud-fake" number "0" should contain "in_in_any" as json field "firewall_rules.0.name" diff --git a/internal/features/vcloud/update_instances_resource.feature b/internal/features/vcloud/update_instances_resource.feature index bb9d1c4..ee388e0 100644 --- a/internal/features/vcloud/update_instances_resource.feature +++ b/internal/features/vcloud/update_instances_resource.feature @@ -12,7 +12,7 @@ Feature: Environment apply Then an event "instance.update.vcloud-fake" should be called exactly "2" times And all "instance.update.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "instance.update.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "instance.update.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "instance.update.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "instance.update.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "instance.update.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And message "instance.update.vcloud-fake" number "0" should contain "web-1" as json field "name" diff --git a/internal/features/vcloud/update_nat_rules.feature b/internal/features/vcloud/update_nat_rules.feature index 9543f00..a5eb305 100644 --- a/internal/features/vcloud/update_nat_rules.feature +++ b/internal/features/vcloud/update_nat_rules.feature @@ -13,7 +13,7 @@ Feature: Environment apply And all "router.update.vcloud-fake" messages should contain a field "_provider" with "vcloud-fake" And all "router.update.vcloud-fake" messages should contain a field "name" with "vse2" And all "router.update.vcloud-fake" messages should contain a field "datacenter_name" with "fakevcloud" - And all "router.update.vcloud-fake" messages should contain an encrypted field "vcloud_url" with "https://vcloud.net" + And all "router.update.vcloud-fake" messages should contain a field "vcloud_url" with "https://vcloud.net" And all "router.update.vcloud-fake" messages should contain an encrypted field "datacenter_username" with "fakeuser@test" And all "router.update.vcloud-fake" messages should contain an encrypted field "datacenter_password" with "test123" And message "router.update.vcloud-fake" number "0" should contain "dnat" as json field "nat_rules.0.type"