@hiiretail/gcp-infra-cli 0.88.1 → 0.89.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/generators/clan-resources/clan-project/templates/clan-resources/gke/terragrunt.hcl +2 -1
  2. package/generators/clan-resources/clan-project/templates/clan-resources/network/spec.hcl +1 -1
  3. package/generators/clan-resources/clan-project/templates/clan-resources/serverless-vpc-connector/terragrunt.hcl +1 -1
  4. package/generators/common-resources/pubsub/append.js +2 -0
  5. package/generators/common-resources/pubsub/templates/pubsub/subscribers.yaml +4 -2
  6. package/generators/common-resources/pubsub/templates/pubsub-external/subscribers.yaml +4 -2
  7. package/package.json +1 -1
package/generators/clan-resources/clan-project/templates/clan-resources/gke/terragrunt.hcl CHANGED
@@ -1,7 +1,8 @@
1
1
  # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
2
2
  # working directory, into a temporary folder, and execute your Terraform commands in that folder.
3
3
  terraform {
4
- source = "git::https://github.com/terraform-google-modules/terraform-google-kubernetes-engine//modules/beta-autopilot-private-cluster?ref=v25.0.0"
4
+ # temp solution, change to the latest release once this is merged
5
+ source = "git::https://github.com/pziggo/terraform-google-kubernetes-engine//modules/beta-autopilot-private-cluster?ref=pziggo_autopilot_dns_config"
5
6
  }
6
7
 
7
8
  # Include all settings from the root terragrunt.hcl file
package/generators/clan-resources/clan-project/templates/clan-resources/network/spec.hcl CHANGED
@@ -27,7 +27,7 @@ locals {
27
27
  subnet_region = "europe-west1"
28
28
  purpose = "REGIONAL_MANAGED_PROXY"
29
29
  role = "ACTIVE"
30
- description = "The subnet must be used only for Serverless VPC connector"
30
+ description = "Reserved proxy-only subnet for Internal load balancing"
31
31
  }
32
32
  ]
33
33
 
package/generators/clan-resources/clan-project/templates/clan-resources/serverless-vpc-connector/terragrunt.hcl CHANGED
@@ -26,7 +26,7 @@ inputs = merge(
26
26
  project_id = dependency.project.outputs.project_id
27
27
  vpc_connectors = [
28
28
  {
29
- name = "${local.clan_name}-connector"
29
+ name = "${local.clan_name}-vpc-connector"
30
30
  region = "europe-west1"
31
31
  subnet_name = "vpc-connector-subnet"
32
32
  host_project_id = dependency.project.outputs.project_id
package/generators/common-resources/pubsub/append.js CHANGED
@@ -68,6 +68,7 @@ const appendNotIncludePush = async (inputs, subscriptionFilePath, dlqTopic) => {
68
68
  oidc_service_account_email: inputs.oidcEmail,
69
69
  audience: inputs.audience,
70
70
  expiration_policy: '',
71
+ filter: `attributes.Consumer = "${inputs.subscriberName}" OR NOT attributes:Consumer`,
71
72
  },
72
73
  );
73
74
 
@@ -97,6 +98,7 @@ const appendIncludePush = async (
97
98
  oidc_service_account_email: input.oidcEmail,
98
99
  audience: input.audience,
99
100
  expiration_policy: '',
101
+ filter: `attributes.Consumer = "${input.subscriberName}" OR NOT attributes:Consumer`,
100
102
  },
101
103
  );
102
104
  await addDLQ(newPushArray, input.env, dlqTopic);
package/generators/common-resources/pubsub/templates/pubsub/subscribers.yaml CHANGED
@@ -4,8 +4,10 @@
4
4
  dead_letter_topic: "<%-dlqTopic%>" <% } %>
5
5
  oidc_service_account_email: "<%-oidcEmail%>"
6
6
  audience: "<%-audience%>"
7
- expiration_policy: ""<% } %><% if (createResource == 'subscription' && pushOrPull == 'pull') { %>pull_subscriptions:
7
+ expiration_policy: ""
8
+ filter: 'attributes.Consumer = "<%-subscriberName%>" OR NOT attributes:Consumer' <% } %><% if (createResource == 'subscription' && pushOrPull == 'pull') { %>pull_subscriptions:
8
9
  - name: "<%-existingTopic%>+<%-subscriberName%>"
9
10
  ack_deadline_seconds: "60" <% if (env == 'prod') { %>
10
11
  dead_letter_topic: "<%-dlqTopic%>" <% } %>
11
- expiration_policy: ""<% } %>
12
+ expiration_policy: ""
13
+ filter: 'attributes.Consumer = "<%-subscriberName%>" OR NOT attributes:Consumer'<% } %>
package/generators/common-resources/pubsub/templates/pubsub-external/subscribers.yaml CHANGED
@@ -4,8 +4,10 @@
4
4
  dead_letter_topic: "<%-dlqTopic%>" <% } %>
5
5
  oidc_service_account_email: "<%-oidcEmail%>"
6
6
  audience: "<%-audience%>"
7
- expiration_policy: ""<% } %><% if (pushOrPull == 'pull') { %>pull_subscriptions:
7
+ expiration_policy: ""
8
+ filter: 'attributes.Consumer = "<%-subscriberName%>" OR NOT attributes:Consumer'<% } %><% if (pushOrPull == 'pull') { %>pull_subscriptions:
8
9
  - name: "<%-existingTopic%>+<%-subscriberName%>"
9
10
  ack_deadline_seconds: "60" <% if (env == 'prod') { %>
10
11
  dead_letter_topic: "<%-dlqTopic%>" <% } %>
11
- expiration_policy: ""<% } %>
12
+ expiration_policy: ""
13
+ filter: 'attributes.Consumer = "<%-subscriberName%>" OR NOT attributes:Consumer'<% } %>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hiiretail/gcp-infra-cli",
3
- "version": "0.88.1",
3
+ "version": "0.89.0",
4
4
  "description": "Infrastructure as code generator for GCP.",
5
5
  "main": "src/cli.js",
6
6
  "bin": {