Skip to content

Commit 2b62361

Browse files
committed
*/provision.rb: bundler/inline
1 parent 304eb85 commit 2b62361

8 files changed

Lines changed: 18 additions & 52 deletions

File tree

tf/dhcp/Gemfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

tf/dhcp/Gemfile.lock

Lines changed: 0 additions & 13 deletions
This file was deleted.

tf/dhcp/provision.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
require 'trilogy'
1+
require 'bundler/inline'
2+
gemfile do
3+
source 'https://rubygems.org'
4+
gem 'trilogy'
5+
gem 'bigdecimal' # https://github.com/trilogy-libraries/trilogy/commit/6b4e12410d9cdcbe07454b0b8af888972f578b1c
6+
end
27
require 'tempfile'
38
require 'open-uri'
9+
410
begin
511
forwarder = spawn(*%w(ssh -N -L), "127.0.0.1:13366:#{ENV.fetch('RDS_HOST')}:#{ENV.fetch('RDS_PORT')}", 'bastion.rubykaigi.net')
612
warn "127.0.0.1:13366:#{ENV.fetch('RDS_HOST')}:#{ENV.fetch('RDS_PORT')}"

tf/dhcp/provision.tf

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,14 @@ resource "kubernetes_secret_v1" "kea-mysql" {
3131
depends_on = [null_resource.rds-provision]
3232
}
3333

34-
resource "null_resource" "bundle-install" {
35-
triggers = {
36-
lockdgst = filesha256("${path.module}/Gemfile.lock")
37-
}
38-
provisioner "local-exec" {
39-
command = "bundle install"
40-
}
41-
}
34+
4235
resource "null_resource" "rds-provision" {
4336
triggers = {
4437
rds_cluster_id = aws_rds_cluster.kea.id
4538
epoch = 3
4639
}
4740
provisioner "local-exec" {
48-
command = "bundle exec ruby provision.rb"
41+
command = "ruby provision.rb"
4942
environment = {
5043
RDS_HOST = aws_rds_cluster.kea.endpoint
5144
RDS_PORT = aws_rds_cluster.kea.port
@@ -55,5 +48,5 @@ resource "null_resource" "rds-provision" {
5548
}
5649
}
5750

58-
depends_on = [null_resource.bundle-install, aws_rds_cluster_instance.kea-001]
51+
depends_on = [aws_rds_cluster_instance.kea-001]
5952
}

tf/grafana/Gemfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

tf/grafana/Gemfile.lock

Lines changed: 0 additions & 13 deletions
This file was deleted.

tf/grafana/provision.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
require 'trilogy'
1+
require 'bundler/inline'
2+
gemfile do
3+
source 'https://rubygems.org'
4+
gem 'trilogy'
5+
gem 'bigdecimal' # https://github.com/trilogy-libraries/trilogy/commit/6b4e12410d9cdcbe07454b0b8af888972f578b1c
6+
end
27
require 'tempfile'
38
require 'open-uri'
49
begin

tf/grafana/provision.tf

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,13 @@ resource "kubernetes_secret_v1" "grafana-mysql" {
3030
depends_on = [null_resource.rds-provision]
3131
}
3232

33-
resource "null_resource" "bundle-install" {
34-
triggers = {
35-
lockdgst = filesha256("${path.module}/Gemfile.lock")
36-
}
37-
provisioner "local-exec" {
38-
command = "bundle install"
39-
}
40-
}
4133
resource "null_resource" "rds-provision" {
4234
triggers = {
4335
rds_cluster_id = aws_rds_cluster.grafana.id
4436
epoch = 3
4537
}
4638
provisioner "local-exec" {
47-
command = "bundle exec ruby provision.rb"
39+
command = "ruby provision.rb"
4840
environment = {
4941
RDS_HOST = aws_rds_cluster.grafana.endpoint
5042
RDS_PORT = aws_rds_cluster.grafana.port
@@ -54,5 +46,5 @@ resource "null_resource" "rds-provision" {
5446
}
5547
}
5648

57-
depends_on = [null_resource.bundle-install, aws_rds_cluster_instance.grafana-001]
49+
depends_on = [aws_rds_cluster_instance.grafana-001]
5850
}

0 commit comments

Comments
 (0)