terrafying-components 2.0.2 → 2.0.7

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/terrafying/components/dynamicset.rb +2 -2
  3. data/lib/terrafying/components/prometheus.rb +1 -1
  4. data/lib/terrafying/components/security/config_aggregator.rb +1 -1
  5. data/lib/terrafying/components/service.rb +2 -2
  6. data/lib/terrafying/components/staticset.rb +3 -3
  7. data/lib/terrafying/components/version.rb +1 -1
  8. data/lib/terrafying/components/vpn.rb +12 -2
  9. data/lib/terrafying/components/vpn_oidc.rb +12 -2
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 531068834c168dad0b71d0a3c4f4b932a5eed123080e4067dd89d93019c8f44e
4
- data.tar.gz: 319ea675df31d948d5c848d770063ba99ee3fe260b693bc33b9b75bdcaa45383
3
+ metadata.gz: d27dba45000471cefaca8b0bb650380123f1ccdbdf52adc240689e4b260533d3
4
+ data.tar.gz: 9bc0cfa749d0060ff0f9213a12baa661e4c6383bc2d256fb4daea225a4c7cfc8
5
5
  SHA512:
6
- metadata.gz: f8f6832c4d666801d7340e57b9c4ca2ef01aee8ade2b0984dc65ca7d4862087181bc677c6fc9695709b9453b825535f38787588a171bf2ac3022ff30e1e062eb
7
- data.tar.gz: 0d0e950b58598feb5e552e6be39e7360a7cac0ac7389548515bae45d5dd17070d2c0b985f3a9725c187741faa4dc71c9a36680e8d7dd890526dba9040abc6786
6
+ metadata.gz: 17044b38860633249fd30a06ceff2c7db97cd8570900fa53c813cc2efd8fbd99463b3650f60180b0d181156ca11331394da1db89d8afaaea7321605c4e80b201
7
+ data.tar.gz: 0b5f7e9f9c23c4478d2255686de6e8412713b8ef36b5295b2955187be2978064e338c6f910c6220bf3611b3b1e4aa3a34da66ceaeb9b271373f18d2231f963dc
data/lib/terrafying/components/dynamicset.rb CHANGED
@@ -33,7 +33,7 @@ module Terrafying
33
33
  options = {
34
34
  public: false,
35
35
  eip: false,
36
- ami: aws.ami('base-image-fc-2860fb52', owners = ['136393635417']),
36
+ ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
37
37
  instance_type: 't3a.micro',
38
38
  instances: { min: 1, max: 1, desired: 1, tags: {} },
39
39
  ports: [],
@@ -44,7 +44,7 @@ module Terrafying
44
44
  subnets: vpc.subnets.fetch(:private, []),
45
45
  depends_on: [],
46
46
  rolling_update: :simple,
47
- metadata_options: {},
47
+ metadata_options: nil,
48
48
  vpc_endpoints_egress: []
49
49
  }.merge(options)
50
50
 
data/lib/terrafying/components/prometheus.rb CHANGED
@@ -22,7 +22,7 @@ module Terrafying
22
22
  thanos_name: 'thanos',
23
23
  thanos_version: 'v0.10.1',
24
24
  prom_name: 'prometheus',
25
- prom_version: 'v2.15.2',
25
+ prom_version: 'v2.23.0',
26
26
  instances: 2,
27
27
  instance_type: 't3a.small',
28
28
  thanos_instance_type: 't3a.small',
data/lib/terrafying/components/security/config_aggregator.rb CHANGED
@@ -42,7 +42,7 @@ module Terrafying
42
42
  provider: @provider,
43
43
  role: role["name"],
44
44
  policy_arn: "arn:aws:iam::aws:policy/service-role/AWSConfigRoleForOrganizations",
45
- }
45
+ }.compact
46
46
 
47
47
  source = {}
48
48
 
data/lib/terrafying/components/service.rb CHANGED
@@ -41,7 +41,7 @@ module Terrafying
41
41
 
42
42
  def create_in(vpc, name, options = {})
43
43
  options = {
44
- ami: aws.ami('base-image-fc-2860fb52', owners = ['136393635417']),
44
+ ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
45
45
  instance_type: 't3a.micro',
46
46
  ports: [],
47
47
  instances: [{}],
@@ -59,7 +59,7 @@ module Terrafying
59
59
  subnets: vpc.subnets.fetch(:private, []),
60
60
  startup_grace_period: 300,
61
61
  depends_on: [],
62
- metadata_options: {},
62
+ metadata_options: nil,
63
63
  audit_role: "arn:aws:iam::#{aws.account_id}:role/auditd_logging",
64
64
  metrics_ports: [],
65
65
  vpc_endpoints_egress: []
data/lib/terrafying/components/staticset.rb CHANGED
@@ -38,7 +38,7 @@ module Terrafying
38
38
  options = {
39
39
  public: false,
40
40
  eip: false,
41
- ami: aws.ami('base-image-fc-2860fb52', owners = ['136393635417']),
41
+ ami: aws.ami('base-image-fc-3c48f829', owners = ['477284023816']),
42
42
  instance_type: 't3a.micro',
43
43
  subnets: vpc.subnets.fetch(:private, []),
44
44
  ports: [],
@@ -63,7 +63,7 @@ module Terrafying
63
63
  description: "Describe the ingress and egress of the static set #{ident}",
64
64
  tags: options[:tags],
65
65
  vpc_id: vpc.id
66
-
66
+
67
67
  vpc_endpoints_egress = options[:vpc_endpoints_egress]
68
68
  if vpc_endpoints_egress.empty?
69
69
  default_egress_rule(ident, @security_group)
@@ -102,7 +102,7 @@ module Terrafying
102
102
  type: 'ingress',
103
103
  from_port: from_port(port[:upstream_port]),
104
104
  to_port: to_port(port[:upstream_port]),
105
- protocol: port[:type],
105
+ protocol: port[:type] == 'udp' ? 'udp' : 'tcp',
106
106
  self: true
107
107
  end
108
108
 
data/lib/terrafying/components/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Terrafying
4
4
  module Components
5
- VERSION = '2.0.2'
5
+ VERSION = '2.0.7'
6
6
  end
7
7
  end
data/lib/terrafying/components/vpn.rb CHANGED
@@ -134,7 +134,12 @@ module Terrafying
134
134
  from_port: 0,
135
135
  to_port: 0,
136
136
  protocol: -1,
137
- security_groups: [@service.egress_security_group]
137
+ security_groups: [@service.egress_security_group],
138
+ ipv6_cidr_blocks: nil,
139
+ prefix_list_ids: nil,
140
+ cidr_blocks: nil,
141
+ self: nil,
142
+ description: nil
138
143
  }
139
144
  ]
140
145
 
@@ -143,7 +148,12 @@ module Terrafying
143
148
  from_port: 0,
144
149
  to_port: 0,
145
150
  protocol: -1,
146
- cidr_blocks: ["#{@ip_address}/32"]
151
+ cidr_blocks: ["#{@ip_address}/32"],
152
+ ipv6_cidr_blocks: nil,
153
+ prefix_list_ids: nil,
154
+ security_groups: nil,
155
+ self: nil,
156
+ description: nil
147
157
  }
148
158
  end
149
159
 
data/lib/terrafying/components/vpn_oidc.rb CHANGED
@@ -134,7 +134,12 @@ module Terrafying
134
134
  from_port: 0,
135
135
  to_port: 0,
136
136
  protocol: -1,
137
- security_groups: [@service.egress_security_group]
137
+ security_groups: [@service.egress_security_group],
138
+ ipv6_cidr_blocks: nil,
139
+ prefix_list_ids: nil,
140
+ cidr_blocks: nil,
141
+ self: nil,
142
+ description: nil,
138
143
  }
139
144
  ]
140
145
 
@@ -143,7 +148,12 @@ module Terrafying
143
148
  from_port: 0,
144
149
  to_port: 0,
145
150
  protocol: -1,
146
- cidr_blocks: ["#{@ip_address}/32"]
151
+ cidr_blocks: ["#{@ip_address}/32"],
152
+ ipv6_cidr_blocks: nil,
153
+ prefix_list_ids: nil,
154
+ security_groups: nil,
155
+ self: nil,
156
+ description: nil
147
157
  }
148
158
  end
149
159
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: terrafying-components
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2
4
+ version: 2.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - uSwitch Limited
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-28 00:00:00.000000000 Z
11
+ date: 2020-12-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake