pi_build_modifier 0.3.0.pre.alpha → 0.3.1.pre.alpha

data/pi_build_modifier/spec/pi_build_modifier/net-tweaks/wifi_network_spec.rb

@@ -0,0 +1,91 @@
+# Copyright (c) 2017-2019 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../../spec_helper'
+require 'rspec'
+require 'fileutils'
+require 'pi_build_modifier/net-tweaks/wifi_network'
+require 'pi_build_modifier/modifier/erb_mapper'
+require 'pi_build_modifier/modifier/pi_modifier'
+
+
+RSpec.describe PiBuildModifier::WPASupplicant do
+
+  let(:empty_json_config) {'config_empty.json'}
+  let(:json_config) {'config_full.json'}
+  let(:workspace) {File.dirname(__FILE__) + '/workspace'}
+
+  before do
+    FileUtils.mkdir_p workspace
+    File.open(empty_json_config, 'w') {|file| file.write('{}')}
+    File.open(json_config, 'w') {|file| file.write(' {"wifi" : {
+    "wpa_country" : "DE_test",
+    "networks": [
+      {
+        "ssid": "test_wpsk",
+        "wpsk": "test_wpsk"
+      }
+    ]
+  }
+}
+')}
+  end
+
+  after do
+    FileUtils.rm(empty_json_config)
+    FileUtils.rm(json_config)
+    FileUtils.rm_rf workspace
+  end
+
+  it 'should create a default wpa_supplicant.config when no change is specified in the json configuration file' do
+
+    #Given
+    modifier = PiBuildModifier::PiModifier.new
+    wpa_supplicant = PiBuildModifier::WPASupplicant.new
+    mapper = PiBuildModifier::ERBMapper.new(wpa_supplicant, workspace)
+
+    #When
+    modifier.with_json_configuration(empty_json_config)
+    modifier.with_mapper(mapper)
+    modifier.modify
+
+    #Then
+    expect(Pathname.new(workspace + '/' + wpa_supplicant.relative_output_path)).to be_file
+  end
+
+  it 'should create a wpa_supplicant.config with all changes that are specified in the json configuration file' do
+
+    #Given
+    modifier = PiBuildModifier::PiModifier.new
+    wpa_supplicant = PiBuildModifier::WPASupplicant.new
+    mapper = wpa_supplicant.mapper(workspace)
+
+    #When
+    modifier.with_json_configuration(json_config)
+    modifier.with_mapper(mapper)
+    modifier.modify
+
+    #Then
+    wpa_supplicant_file = File.read(workspace + '/' + wpa_supplicant.relative_output_path)
+    expect(wpa_supplicant_file).to match(/network/)
+  end
+
+end
+

data/pi_build_modifier/spec/pi_build_modifier/sys_tweaks/run_modifier_spec.rb

@@ -0,0 +1,74 @@
+# Copyright (c) 2017-2019 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../../spec_helper'
+require 'rspec'
+require 'fileutils'
+require 'pi_build_modifier/sys_tweaks/run_modifier'
+require 'pi_build_modifier/modifier/pi_modifier'
+require 'pi_build_modifier/modifier/mapper'
+
+RSpec.describe PiBuildModifier::RunModifier do
+
+  let(:workspace) {File.dirname(__FILE__) + '/workspace'}
+
+  before do
+    FileUtils.mkdir_p workspace
+  end
+
+  after do
+    FileUtils.rm_rf workspace
+  end
+
+  it 'should be of type Mapper' do
+    expect(PiBuildModifier::RunModifier.new).to be_a PiBuildModifier::Mapper
+  end
+
+  it 'should append lines to the 01-run.sh file' do
+
+    #Given
+    modifier = PiBuildModifier::RunModifier.new.mapper(workspace)
+    FileUtils.mkdir_p File.dirname(workspace + '/' + modifier.relative_output_path)
+    FileUtils.touch(workspace + '/' + modifier.relative_output_path)
+    modifier.append(Class.new do
+      def append_line
+        '1'
+      end
+    end.new
+    )
+    modifier.append(Class.new do
+      def append_line
+        '2'
+      end
+    end.new
+    )
+
+
+    #When
+    modifier.modify
+
+    #Then
+    expect(Pathname.new(workspace + '/' + modifier.relative_output_path)).to be_file
+    expect(IO.read(Pathname.new(workspace + '/' + modifier.relative_output_path))).to match(/\nsource #{workspace}\/1\nsource #{workspace}\/2\n/)
+
+  end
+
+end
+

data/pi_build_modifier/spec/pi_build_modifier/sys_tweaks/ssh_spec.rb

@@ -0,0 +1,73 @@
+# Copyright (c) 2017-2019 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../../spec_helper'
+require 'rspec'
+require 'fileutils'
+require 'pi_build_modifier/sys_tweaks/ssh'
+require 'pi_build_modifier/sys_tweaks/run_modifier'
+require 'pi_build_modifier/modifier/erb_mapper'
+require 'pi_build_modifier/modifier/pi_modifier'
+
+
+RSpec.describe PiBuildModifier::Ssh do
+
+  let(:empty_json_config) {'config_empty.json'}
+  let(:workspace) {File.dirname(__FILE__) + '/workspace'}
+
+  before do
+    File.open(empty_json_config, 'w') {|file| file.write('{}')}
+    FileUtils.mkdir_p workspace
+  end
+
+  after do
+    FileUtils.rm(empty_json_config)
+    FileUtils.rm_rf workspace
+  end
+
+  it 'does not accept an invalid config' do
+    #Given
+    modifier = PiBuildModifier::PiModifier.new
+    ssh = PiBuildModifier::Ssh.new
+    mapper = ssh.mapper(workspace)
+
+    #When
+    modifier.with_json_configuration('cfg')
+    modifier.with_mapper(mapper)
+
+    expect{ modifier.modify }.to raise_error()
+  end
+
+  it 'should create a default ssh.sh file' do
+    #Given
+    modifier = PiBuildModifier::PiModifier.new
+    ssh = PiBuildModifier::Ssh.new
+    mapper = ssh.mapper(workspace)
+
+    #When
+    modifier.with_json_configuration(empty_json_config)
+    modifier.with_mapper(mapper)
+    modifier.modify
+
+    #Then
+    expect(Pathname.new(workspace + '/' + ssh.relative_output_path)).to be_file
+  end
+end
+

data/pi_build_modifier/spec/pi_build_modifier/system/system_spec.rb

@@ -0,0 +1,66 @@
+# Copyright (c) 2017-2019 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative '../../spec_helper'
+require 'rspec'
+require 'fileutils'
+require 'pi_build_modifier/system/system_type'
+require 'pi_build_modifier/modifier/mapper'
+
+RSpec.describe PiBuildModifier::System do
+
+  EXPECTED_SYSTEM_NAME = 'chiipi_test'
+  EXPECTED_SYSTEM_TYPE = 'lite'
+  let(:config) {{'system' => {'name' => EXPECTED_SYSTEM_NAME, 'type' => EXPECTED_SYSTEM_TYPE}}}
+  let(:workspace) {"#{File.dirname(__FILE__)}/workspace"}
+
+
+  after(:each) do
+    FileUtils.rm_rf(workspace) if Dir.exist?(workspace)
+  end
+
+
+  it 'should map the name and type given in a hash to corresponding members' do
+    #Given
+    system = PiBuildModifier::System.new.mapper(workspace)
+
+    #When
+    system.map(config)
+
+    #Then
+    expect(system.name).to eq(EXPECTED_SYSTEM_NAME)
+    expect(system.type).to eq(EXPECTED_SYSTEM_TYPE)
+  end
+
+  it 'should map the name and type to variables' do
+    #Given
+    system = PiBuildModifier::System.new.mapper(workspace)
+
+    #When
+    system.map(config)
+    system.modify
+
+    #Then
+    %w(/config /stage3/SKIP /stage4/SKIP /stage5/SKIP).each do |file|
+      expect(Pathname.new(workspace + file)).to be_file
+    end
+  end
+
+end

data/pi_build_modifier/spec/pi_build_modifier_spec.rb

@@ -0,0 +1,73 @@
+# Copyright (c) 2017-2019 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'spec_helper'
+require 'pi_build_modifier'
+require 'pi_build_modifier/version'
+require 'pi_build_modifier/modifier_task'
+
+RSpec.describe PiBuildModifier do
+  it 'has a version number' do
+    expect(PiBuildModifier::VERSION).not_to be nil
+  end
+end
+
+RSpec.describe PiBuildModifier::PiBuildModifier do
+
+  it 'informs about valid commands when called with no arguments' do
+    expect {PiBuildModifier::PiBuildModifier.start([])}.to output(/Commands/).to_stdout
+  end
+
+  context '#version' do
+    it 'informs about the current version' do
+      expect {PiBuildModifier::PiBuildModifier.start(%w(version))}.to output(/#{PiBuildModifier::VERSION}/).to_stdout
+    end
+  end
+
+  context '#modify' do
+
+    let(:tmp_json_config) {'tmp_config.json'}
+    let(:tmp_workspace) {'tmp_space'}
+
+    before do
+      File.open(tmp_json_config, 'w') {|file| file.write('{}')}
+      FileUtils.mkdir_p tmp_workspace
+    end
+
+    after do
+      FileUtils.rm(tmp_json_config)
+      FileUtils.rm_rf tmp_workspace
+    end
+
+    it 'is called by thor, when "pi_build_modifier modify" is called' do
+      expect_any_instance_of(PiBuildModifier::PiBuildModifier).to receive(:modify).with(tmp_json_config, tmp_workspace)
+      PiBuildModifier::PiBuildModifier.start(['modify', tmp_json_config, tmp_workspace])
+    end
+
+    it 'triggers the modifier task' do
+      expect(PiBuildModifier::Task::Modifier).to receive(:new).with(tmp_json_config, tmp_workspace).and_return(PiBuildModifier::Task::Modifier.new(tmp_json_config, tmp_workspace))
+      expect_any_instance_of(PiBuildModifier::Task::Modifier).to receive(:execute)
+      PiBuildModifier::PiBuildModifier.start(['modify', tmp_json_config, tmp_workspace])
+    end
+  end
+end
+
+
+

data/pi_build_modifier/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'simplecov'
+#require 'codecov'
+
+SimpleCov.start do
+  add_filter %r{/spec/}
+end
+#  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

data/pi_customizer/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/pi_customizer/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+# Specify your gem's dependencies in pi_build_modifier.gemspec
+gemspec

data/pi_customizer/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017-2019 Beate Ottenwälder
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/pi_customizer/README.md

@@ -0,0 +1,3 @@
+# pi_customizer
+
+see https://github.com/ottenwbe/pi-gen-environment

data/pi_customizer/Rakefile

@@ -0,0 +1,13 @@
+lib = File.join(File.dirname(__FILE__), '/lib')
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+begin
+  require 'bundler/gem_tasks'
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+  task :default => :spec
+
+rescue LoadError
+  puts 'RSpec or Bundler is not installed. This means rake is not able to execute tests!'
+end

data/pi_customizer/Vagrantfile

@@ -0,0 +1,16 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2') do |config|
+
+  config.vm.box = "ubuntu/xenial64"
+
+  config.vm.provision 'shell', inline: <<-SHELL
+    sudo apt update
+    sudo apt -y install build-essential ruby-full 
+    gem install bundler 
+    cd /vagrant
+    bundle install
+    rake spec
+  SHELL
+end

data/pi_customizer/bin/pi_customizer

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2017-2019 Beate Ottenwälder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'pi_customizer'
+
+PiCustomizer::PiCustomizer.start(ARGV)

data/pi_customizer/envs/aws/outputs.tf

@@ -0,0 +1,3 @@
+output "pi-builder-ip" {
+  value = "${aws_instance.pi_builder_vm.public_ip}"
+}

data/pi_customizer/envs/aws/pi-build-env.tf

@@ -0,0 +1,160 @@
+/* Setup the aws provider */
+provider "aws" {
+  access_key = "${var.access_key}"
+  secret_key = "${var.secret_key}"
+  region = "${var.region}"
+}
+
+/* Define the vpc */
+resource "aws_vpc" "pi_builder_vpc" {
+  cidr_block = "${var.vpc_cidr}"
+  enable_dns_hostnames = true
+
+  tags {
+    name = "pi-builder vpc"
+  }
+}
+
+/** key for deployment of jumpbox and nat */
+resource "aws_key_pair" "pi_builder_key" {
+  key_name = "pi-builder"
+  public_key = "${file("${var.ssh_path}/pi-builder.pub")}"
+}
+
+
+/** pi-build-vm instance */
+resource "aws_instance" "pi_builder_vm" {
+  ami = "${lookup(var.amis, var.region)}"
+  availability_zone = "${var.default_az}"
+  instance_type = "t2.micro"
+  subnet_id = "${aws_subnet.pi_builder_subnet.id}"
+
+  root_block_device {
+    delete_on_termination = true
+    iops = 0
+    volume_size = 50
+    volume_type = "gp2"
+  }
+
+  vpc_security_group_ids = [
+    "${aws_security_group.ssh.id}",
+    "${aws_security_group.http.id}"]
+  key_name = "${aws_key_pair.pi_builder_key.key_name}"
+
+  provisioner "file" {
+    connection {
+      user = "ubuntu"
+      host = "${aws_instance.pi_builder_vm.public_dns}"
+      timeout = "25m"
+      private_key = "${file("${var.ssh_path}/pi-builder.pem")}"
+    }
+    source = "../sh/build-pi-img.sh"
+    destination = "/home/ubuntu/build-pi-img.sh"
+  }
+
+  provisioner "remote-exec" {
+    connection {
+      user = "ubuntu"
+      host = "${aws_instance.pi_builder_vm.public_dns}"
+      timeout = "25m"
+      private_key = "${file("${var.ssh_path}/pi-builder.pem")}"
+    }
+    inline = [
+      "sh build-pi-img.sh"
+    ]
+  }
+
+  tags = {
+    name = "pi-builder vm"
+  }
+}
+
+resource "aws_eip" "lb" {
+  instance = "${aws_instance.pi_builder_vm.id}"
+  vpc = true
+}
+
+resource "aws_security_group" "ssh" {
+  name = "ssh"
+  description = "SSH access to instances from the internet"
+  vpc_id = "${aws_vpc.pi_builder_vpc.id}"
+
+  ingress {
+    from_port = 22
+    to_port = 22
+    protocol = "tcp"
+
+    cidr_blocks = [
+      "0.0.0.0/0",
+    ]
+  }
+
+  tags {
+    name = "ssh sg"
+  }
+}
+
+resource "aws_security_group" "http" {
+
+  name = "http"
+  description = "Outbound http(s) connections."
+  vpc_id = "${aws_vpc.pi_builder_vpc.id}"
+
+  egress {
+    from_port = 80
+    to_port = 80
+    protocol = "tcp"
+    cidr_blocks = [
+      "0.0.0.0/0"]
+  }
+
+  egress {
+    from_port = 443
+    to_port = 443
+    protocol = "tcp"
+    cidr_blocks = [
+      "0.0.0.0/0"]
+  }
+
+  tags {
+    name = "http sg"
+  }
+}
+
+/** internet access */
+resource "aws_internet_gateway" "pi_builder_gateway" {
+  vpc_id = "${aws_vpc.pi_builder_vpc.id}"
+}
+
+
+/** public subnet for the nat instance and the jumpbox */
+resource "aws_subnet" "pi_builder_subnet" {
+  vpc_id = "${aws_vpc.pi_builder_vpc.id}"
+  cidr_block = "${var.public_subnet_cidr}"
+  availability_zone = "${var.default_az}"
+  map_public_ip_on_launch = true
+  depends_on = [
+    "aws_internet_gateway.pi_builder_gateway"]
+
+  tags {
+    name = "pi-builder subnet"
+  }
+}
+
+resource "aws_route_table" "pi_builder_rt" {
+  vpc_id = "${aws_vpc.pi_builder_vpc.id}"
+
+  route {
+    cidr_block = "0.0.0.0/0"
+    gateway_id = "${aws_internet_gateway.pi_builder_gateway.id}"
+  }
+
+  tags {
+    name = "pi-builder rt"
+  }
+}
+
+resource "aws_route_table_association" "pi_builder_rta" {
+  subnet_id = "${aws_subnet.pi_builder_subnet.id}"
+  route_table_id = "${aws_route_table.pi_builder_rt.id}"
+}