@hiiretail/gcp-infra-cli 0.88.2 → 0.89.1

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 (4) hide show
  1. package/generators/common-resources/pubsub/append.js +2 -0
  2. package/generators/common-resources/pubsub/templates/pubsub/subscribers.yaml +4 -2
  3. package/generators/common-resources/pubsub/templates/pubsub-external/subscribers.yaml +4 -2
  4. package/package.json +1 -1
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.2",
3
+ "version": "0.89.1",
4
4
  "description": "Infrastructure as code generator for GCP.",
5
5
  "main": "src/cli.js",
6
6
  "bin": {