diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4ae585a..c8f8016 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,11 +3,6 @@ updates: - package-ecosystem: bundler directory: "/" schedule: - interval: weekly - open-pull-requests-limit: 10 - -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: weekly + interval: daily + time: "13:00" open-pull-requests-limit: 10 diff --git a/.github/workflows/auto_release_prep.yml b/.github/workflows/auto_release_prep.yml deleted file mode 100644 index 328a0b3..0000000 --- a/.github/workflows/auto_release_prep.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Automated release prep - -on: - workflow_dispatch: - -jobs: - auto_release_prep: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1 - secrets: inherit - with: - project-type: ruby - version-file-path: lib/vmpooler-provider-ec2/version.rb diff --git a/.github/workflows/dependabot_merge.yml b/.github/workflows/dependabot_merge.yml deleted file mode 100644 index 75b9cea..0000000 --- a/.github/workflows/dependabot_merge.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Dependabot auto-merge - -on: pull_request - -jobs: - dependabot_merge: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/dependabot_merge.yml@v1 - secrets: inherit diff --git a/.github/workflows/ensure_label.yml b/.github/workflows/ensure_label.yml deleted file mode 100644 index 50a5fa8..0000000 --- a/.github/workflows/ensure_label.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Ensure label - -on: pull_request - -jobs: - ensure_label: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/ensure_label.yml@v1 - secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f036f39..e0538bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release Gem +name: Release on: workflow_dispatch @@ -7,77 +7,25 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'puppetlabs/vmpooler-provider-ec2' steps: - - uses: actions/checkout@v4 - - - name: Get Current Version - uses: actions/github-script@v7 - id: cv - with: - script: | - const { data: response } = await github.rest.repos.getLatestRelease({ - owner: context.repo.owner, - repo: context.repo.repo, - }) - console.log(`The latest release is ${response.tag_name}`) - return response.tag_name - result-encoding: string - - - name: Get Next Version - id: nv + - uses: actions/checkout@v2 + - name: Get Version + id: gv run: | - version=$(grep VERSION lib/vmpooler-provider-ec2/version.rb |rev |cut -d "'" -f2 |rev) - echo "version=$version" >> $GITHUB_OUTPUT - echo "Found version $version from lib/vmpooler-provider-ec2/version.rb" - - - name: Generate Changelog - uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 - with: - args: >- - --future-release ${{ steps.nv.outputs.version }} - env: - CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Validate Changelog - run : | - set -e - if [[ -n $(git status --porcelain) ]]; then - echo "Here is the current git status:" - git status - echo - echo "The following changes were detected:" - git --no-pager diff - echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running `./update-changelog`" - exit 1 - fi - - - name: Generate Release Notes - uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 - with: - args: >- - --since-tag ${{ steps.cv.outputs.result }} - --future-release ${{ steps.nv.outputs.version }} - --output release-notes.md - env: - CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + echo "::set-output name=ver::$(grep VERSION lib/vmpooler-provider-ec2/version.rb |rev |cut -d "'" -f2 |rev)" - name: Tag Release uses: ncipollo/release-action@v1 with: - tag: ${{ steps.nv.outputs.version }} + tag: ${{ steps.gv.outputs.ver }} token: ${{ secrets.GITHUB_TOKEN }} - bodyfile: release-notes.md draft: false prerelease: false - - # This step should closely match what is used in `docker/Dockerfile` in vmpooler-deployment + generateReleaseNotes: true - name: Install Ruby jruby-9.3.6.0 uses: ruby/setup-ruby@v1 with: ruby-version: 'jruby-9.3.6.0' - - name: Build gem run: gem build *.gemspec - - name: Publish gem run: | mkdir -p $HOME/.gem diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml deleted file mode 100644 index ba273f5..0000000 --- a/.github/workflows/security.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Security -on: - workflow_dispatch: - push: - branches: - - main - -jobs: - scan: - name: Mend Scanning - runs-on: ubuntu-latest - steps: - - name: checkout repo content - uses: actions/checkout@v4 - with: - fetch-depth: 1 - - name: setup ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.7 - # setup a package lock if one doesn't exist, otherwise do nothing - - name: check lock - run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock' - # install java - - uses: actions/setup-java@v4 - with: - distribution: 'temurin' # See 'Supported distributions' for available options - java-version: '17' - # download mend - - name: download_mend - run: curl -o wss-unified-agent.jar https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar - - name: run mend - run: java -jar wss-unified-agent.jar - env: - WS_APIKEY: ${{ secrets.MEND_API_KEY }} - WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent - WS_USERKEY: ${{ secrets.MEND_TOKEN }} - WS_PRODUCTNAME: RE - WS_PROJECTNAME: ${{ github.event.repository.name }} diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a5cb0a9..068495e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -19,9 +19,8 @@ jobs: matrix: ruby-version: - 'jruby-9.3.6.0' - - 'jruby-9.4.0.0' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -36,9 +35,8 @@ jobs: matrix: ruby-version: - 'jruby-9.3.6.0' - - 'jruby-9.4.0.0' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github_changelog_generator b/.github_changelog_generator deleted file mode 100644 index 0572251..0000000 --- a/.github_changelog_generator +++ /dev/null @@ -1,3 +0,0 @@ -project=vmpooler-provider-ec2 -user=puppetlabs -exclude_labels=maintenance \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 375e395..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,37 +0,0 @@ -# Changelog - -## [Unreleased](https://github.com/puppetlabs/vmpooler-provider-ec2/tree/HEAD) - -[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-ec2/compare/0.0.2...HEAD) - -**Merged pull requests:** - -- \(RE-15111\) Migrate Snyk to Mend Scanning [\#12](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/12) ([yachub](https://github.com/yachub)) -- \(RE-14811\) Remove DIO as codeowners [\#11](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/11) ([yachub](https://github.com/yachub)) -- Add Snyk action [\#10](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/10) ([yachub](https://github.com/yachub)) -- Add release-engineering to codeowners [\#9](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/9) ([yachub](https://github.com/yachub)) - -## [0.0.2](https://github.com/puppetlabs/vmpooler-provider-ec2/tree/0.0.2) (2022-08-02) - -[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-ec2/compare/0.0.1...0.0.2) - -**Merged pull requests:** - -- Update version.rb [\#8](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/8) ([sbeaulie](https://github.com/sbeaulie)) - -## [0.0.1](https://github.com/puppetlabs/vmpooler-provider-ec2/tree/0.0.1) (2022-08-02) - -[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-ec2/compare/be877a20c5dc7b7ba839ca2c046c6407d1ed22b4...0.0.1) - -**Merged pull requests:** - -- \(DIO-3163\) Implement Cloud DNS for EC2 VMs [\#7](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/7) ([sbeaulie](https://github.com/sbeaulie)) -- \(DIO-3163\) Code improvements after initial testing in vmpooler [\#6](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/6) ([sbeaulie](https://github.com/sbeaulie)) -- Revert "Update net-ssh requirement from ~\> 6.2.0.rc2 to \>= 6.2, \< 7.1" [\#4](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/4) ([sbeaulie](https://github.com/sbeaulie)) -- Change the way we load secrets so that we do not have to pass them as… [\#3](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/3) ([sbeaulie](https://github.com/sbeaulie)) -- Update net-ssh requirement from ~\> 6.2.0.rc2 to \>= 6.2, \< 7.1 [\#2](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/2) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Added aws dependency and renamed directories [\#1](https://github.com/puppetlabs/vmpooler-provider-ec2/pull/1) ([sbeaulie](https://github.com/sbeaulie)) - - - -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/CODEOWNERS b/CODEOWNERS index 75e4feb..d77da6c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ # added by slack-gitbot -* @puppetlabs/release-engineering \ No newline at end of file +* @puppetlabs/dio \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 8c4f918..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,264 +0,0 @@ -PATH - remote: . - specs: - vmpooler-provider-ec2 (0.0.2) - aws-sdk-ec2 (~> 1) - net-ssh (>= 6.2, < 7.1) - vmpooler (~> 2.3, >= 1.3.0) - vmpooler-provider-gce (~> 0.4, >= 0.4.0) - -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - aws-eventstream (1.2.0) - aws-partitions (1.834.0) - aws-sdk-core (3.185.1) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) - jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.412.0) - aws-sdk-core (~> 3, >= 3.184.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.6.0) - aws-eventstream (~> 1, >= 1.0.2) - bindata (2.4.14) - builder (3.2.4) - climate_control (1.2.0) - coderay (1.1.3) - concurrent-ruby (1.2.0) - connection_pool (2.3.0) - declarative (0.0.20) - deep_merge (1.2.2) - diff-lcs (1.5.1) - docile (1.4.0) - faraday (2.7.4) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) - ffi (1.15.5-java) - google-apis-compute_v1 (0.60.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-core (0.10.0) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-dns_v1 (0.29.0) - google-apis-core (>= 0.9.1, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-dns (0.35.1) - google-apis-dns_v1 (~> 0.1) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - zonefile (~> 1.04) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.0) - googleauth (1.2.0) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - httpclient (2.8.3) - jmespath (1.6.2) - json (2.6.3) - json (2.6.3-java) - jwt (2.6.0) - memoist (0.16.2) - method_source (1.0.0) - mini_mime (1.1.2) - mock_redis (0.36.0) - ruby2_keywords - multi_json (1.15.0) - mustermann (2.0.2) - ruby2_keywords (~> 0.0.1) - net-ldap (0.17.1) - net-ssh (7.0.1) - nio4r (2.5.2) - nio4r (2.5.2-java) - opentelemetry-api (1.1.0) - opentelemetry-common (0.19.6) - opentelemetry-api (~> 1.0) - opentelemetry-exporter-jaeger (0.20.1) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.19.2) - opentelemetry-sdk (~> 1.0) - thrift - opentelemetry-instrumentation-base (0.19.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-concurrent_ruby (0.19.2) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-instrumentation-http_client (0.19.4) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-instrumentation-redis (0.21.3) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-instrumentation-sinatra (0.19.3) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-registry (0.2.0) - opentelemetry-api (~> 1.1) - opentelemetry-resource_detectors (0.19.1) - google-cloud-env - opentelemetry-sdk - opentelemetry-sdk (1.2.0) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.19.3) - opentelemetry-registry (~> 0.2) - opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.8.0) - opentelemetry-api (~> 1.0) - os (1.1.4) - parallel (1.23.0) - parser (3.2.2.1) - ast (~> 2.4.1) - pickup (0.0.11) - prometheus-client (2.1.0) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - pry (0.14.2-java) - coderay (~> 1.1) - method_source (~> 1.0) - spoon (~> 0.0) - public_suffix (5.0.1) - puma (5.6.5) - nio4r (~> 2.0) - puma (5.6.5-java) - nio4r (~> 2.0) - rack (2.2.6.4) - rack-protection (2.2.4) - rack - rack-test (2.1.0) - rack (>= 1.3) - rainbow (3.1.1) - rake (13.0.6) - redis (4.8.0) - regexp_parser (2.8.0) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.2.5) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.0) - rubocop (1.50.2) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.2.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.1) - parser (>= 3.2.1.0) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - signet (0.17.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - sinatra (2.2.4) - mustermann (~> 2.0) - rack (~> 2.2) - rack-protection (= 2.2.4) - tilt (~> 2.0) - spicy-proton (2.1.15) - bindata (~> 2.3) - spoon (0.0.6) - ffi - statsd-ruby (1.5.0) - thor (1.2.2) - thrift (0.17.0) - tilt (2.0.11) - trailblazer-option (0.1.2) - uber (0.1.0) - unicode-display_width (2.4.2) - vmpooler (2.5.0) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.2) - deep_merge (~> 1.2) - net-ldap (~> 0.16) - opentelemetry-exporter-jaeger (= 0.20.1) - opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) - opentelemetry-instrumentation-http_client (= 0.19.4) - opentelemetry-instrumentation-redis (= 0.21.3) - opentelemetry-instrumentation-sinatra (= 0.19.3) - opentelemetry-resource_detectors (= 0.19.1) - opentelemetry-sdk (~> 1.0, >= 1.0.2) - pickup (~> 0.0.11) - prometheus-client (~> 2.0) - puma (~> 5.0, >= 5.0.4) - rack (~> 2.2) - rake (~> 13.0) - redis (~> 4.1) - sinatra (~> 2.0) - spicy-proton (~> 2.1) - statsd-ruby (~> 1.4) - vmpooler-provider-gce (0.4.0) - google-apis-compute_v1 (~> 0.14) - google-cloud-dns (~> 0.35.1) - googleauth (>= 0.16.2, < 1.3.0) - webrick (1.8.1) - yarjuf (2.0.0) - builder - rspec (~> 3) - zonefile (1.06) - -PLATFORMS - universal-java-1.8 - universal-java-11 - x86_64-linux - -DEPENDENCIES - climate_control (>= 0.2.0) - mock_redis (>= 0.17.0) - pry - rack-test (>= 0.6) - rspec (>= 3.2) - rubocop (~> 1.50.2) - simplecov (>= 0.11.2) - thor (~> 1.0, >= 1.0.1) - vmpooler-provider-ec2! - yarjuf (>= 2.0) - -BUNDLED WITH - 2.4.5 diff --git a/README.md b/README.md index 9d79a66..2909f3f 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,5 @@ # vmpooler-provider-aws -- [vmpooler-provider-aws](#vmpooler-provider-aws) - - [Usage](#usage) - - [Provisioning the new nodes](#provisioning-the-new-nodes) - - [DNS](#dns) - - [Labels](#labels) - - [Pre-requisite](#pre-requisite) - - [Update the Gemfile Lock](#update-the-gemfile-lock) - - [Releasing](#releasing) - - [License](#license) - This is a provider for [VMPooler](https://github.com/puppetlabs/vmpooler) allows using aws to create instances, disks, snapshots, or destroy instances for specific pools. @@ -65,22 +55,6 @@ do not have the pool label, and can be configured to allow a specific list of un - An IAM user must exist in the target AWS account with permissions to create, delete vms etc - if using DNS see section above, and a service account with permissions to change Cloud DNS need to exist -## Update the Gemfile Lock - -To update the `Gemfile.lock` run `./update-gemfile-lock`. - -Verify, and update if needed, that the docker tag in the script and GitHub action workflows matches what is used in the [vmpooler-deployment Dockerfile](https://github.com/puppetlabs/vmpooler-deployment/blob/main/docker/Dockerfile). - -## Releasing - -Follow these steps to publish a new GitHub release, and build and push the gem to . - -1. Bump the "VERSION" in `lib/vmpooler-provider-ec2/version.rb` appropriately based on changes in `CHANGELOG.md` since the last release. -2. Run `./update-gemfile-lock` to update `Gemfile.lock`. -3. Run `./update-changelog` to update `CHANGELOG.md`. -4. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label. -5. After the pull request is approved and merged, then navigate to Actions --> Release Gem --> run workflow --> Branch: main --> Run workflow. - ## License vmpooler-provider-aws is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). See the [LICENSE](LICENSE) file for more details. \ No newline at end of file diff --git a/lib/vmpooler-provider-ec2/version.rb b/lib/vmpooler-provider-ec2/version.rb index a128ca4..54be4c7 100644 --- a/lib/vmpooler-provider-ec2/version.rb +++ b/lib/vmpooler-provider-ec2/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module VmpoolerProviderEc2 - VERSION = '0.0.2' + VERSION = '0.0.1' end diff --git a/lib/vmpooler/providers/ec2.rb b/lib/vmpooler/providers/ec2.rb index 2a8a647..f857f86 100644 --- a/lib/vmpooler/providers/ec2.rb +++ b/lib/vmpooler/providers/ec2.rb @@ -406,7 +406,7 @@ module Vmpooler # check if a vm is ready by opening a socket on port 22 # if a domain is set, it will use vn_name.domain, # if not then it will use the private dns name directly (AWS workaround) - def vm_ready?(pool_name, vm_name, redis) + def vm_ready?(pool_name, vm_name) begin domain_set = domain if domain_set.nil? @@ -415,10 +415,9 @@ module Vmpooler end open_socket(vm_name, domain_set) rescue StandardError => e - redis.hset("vmpooler__vm__#{vm_name}", 'open_socket_error', e.to_s) + @logger.log('s', "[!] [#{pool_name}] '#{vm_name}' instance cannot be reached by vmpooler on tcp port 22; #{e}") return false end - redis.hdel("vmpooler__vm__#{vm_name}", 'open_socket_error') true end diff --git a/release-prep b/release-prep deleted file mode 100755 index 484c425..0000000 --- a/release-prep +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment -# -# Update Gemfile.lock -docker run -t --rm \ - -v $(pwd):/app \ - jruby:9.4.3.0-jdk11 \ - /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends git make netbase && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"' - -# Update Changelog -docker run -t --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \ - githubchangeloggenerator/github-changelog-generator:1.16.2 \ - github_changelog_generator --future-release $(grep VERSION lib/vmpooler-provider-ec2/version.rb |rev |cut -d "'" -f2 |rev) diff --git a/update-gemfile-lock b/update-gemfile-lock deleted file mode 100755 index 74e9c78..0000000 --- a/update-gemfile-lock +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment -docker run -it --rm \ - -v $(pwd):/app \ - jruby:9.3.6-jdk \ - /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make git && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"' diff --git a/vmpooler-provider-ec2.gemspec b/vmpooler-provider-ec2.gemspec index e45a207..e084e70 100644 --- a/vmpooler-provider-ec2.gemspec +++ b/vmpooler-provider-ec2.gemspec @@ -17,8 +17,10 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_dependency 'aws-sdk-ec2', '~> 1' s.add_dependency 'net-ssh', '>= 6.2', '< 7.1' - s.add_dependency 'vmpooler', '>= 1.3.0', '~> 2.3' - s.add_dependency 'vmpooler-provider-gce', '>= 0.4.0', '~> 0.4' + + s.add_development_dependency 'vmpooler', '>= 1.3.0', '~> 2.3' + #s.add_development_dependency 'vmpooler-provider-gce', '>= 0.4.0', '~> 0.4' + s.add_development_dependency 'vmpooler-provider-gce', '>= 0.4.0', '~> 0.4' # Testing dependencies s.add_development_dependency 'climate_control', '>= 0.2.0' @@ -26,7 +28,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'pry' s.add_development_dependency 'rack-test', '>= 0.6' s.add_development_dependency 'rspec', '>= 3.2' - s.add_development_dependency 'rubocop', '~> 1.50.2' + s.add_development_dependency 'rubocop', '~> 1.28.2' s.add_development_dependency 'simplecov', '>= 0.11.2' s.add_development_dependency 'thor', '~> 1.0', '>= 1.0.1' s.add_development_dependency 'yarjuf', '>= 2.0'