Compare commits

..

58 commits
0.0.2 ... main

Author SHA1 Message Date
puppet-release-bot
1fe13d6c2a
Merge pull request #54 from puppetlabs/dependabot/bundler/rspec-3.13.0
Bump rspec from 3.12.0 to 3.13.0
2024-02-05 10:12:20 -05:00
dependabot[bot]
190f587235
Bump rspec from 3.12.0 to 3.13.0
Bumps [rspec](https://github.com/rspec/rspec-metagem) from 3.12.0 to 3.13.0.
- [Commits](https://github.com/rspec/rspec-metagem/compare/v3.12.0...v3.13.0)

---
updated-dependencies:
- dependency-name: rspec
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-05 15:11:05 +00:00
Jake Spain
b2d6e2f757
Merge pull request #53 from puppetlabs/fix-release-prep-param
(maint) Fix missing param in auto_release_prep
2024-01-19 16:48:34 -05:00
Jake Spain
c79d9c384d
Update release prep script 2024-01-19 15:31:59 -05:00
Jake Spain
71ef3389be
Fix missing param in auto_release_prep 2024-01-15 09:36:37 -05:00
Jake Spain
d5a48f229d
Merge pull request #52 from puppetlabs/dependabot/github_actions/actions/checkout-4
Bump actions/checkout from 3 to 4
2023-12-07 08:54:13 -05:00
Jake Spain
1e16f9b4b7
Merge pull request #51 from puppetlabs/dependabot/github_actions/actions/setup-java-4
Bump actions/setup-java from 3 to 4
2023-12-07 08:53:56 -05:00
Jake Spain
89ad66b17b
Merge pull request #50 from puppetlabs/dependabot/github_actions/actions/github-script-7
Bump actions/github-script from 6 to 7
2023-12-07 08:53:40 -05:00
dependabot[bot]
1d9565183d
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-07 13:47:11 +00:00
dependabot[bot]
6fd840c050
Bump actions/setup-java from 3 to 4
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-07 13:47:06 +00:00
dependabot[bot]
017453870c
Bump actions/github-script from 6 to 7
Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-07 13:47:01 +00:00
Jake Spain
006e2e719d
Merge pull request #49 from puppetlabs/repo-sync
Add dependabot, release prep, and label reusable workflows from release-engineering-repo-standards
2023-12-07 08:46:25 -05:00
Jake Spain
fa23812f28
syncing files from release-engineering-repo-standards 2023-12-06 17:16:54 -05:00
Jake Spain
3c30b57d73
Merge pull request #42 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.412.0
Bump aws-sdk-ec2 from 1.407.0 to 1.412.0
2023-10-09 11:23:14 -04:00
dependabot[bot]
d459aaea5f
Bump aws-sdk-ec2 from 1.407.0 to 1.412.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.407.0 to 1.412.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-09 15:04:50 +00:00
Jake Spain
87f3440808
Merge pull request #40 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.407.0
Bump aws-sdk-ec2 from 1.405.0 to 1.407.0
2023-10-02 11:34:21 -04:00
dependabot[bot]
9d0106ebfc
Bump aws-sdk-ec2 from 1.405.0 to 1.407.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.405.0 to 1.407.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-25 15:22:03 +00:00
Jake Spain
3e0ffd4501
Merge pull request #39 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.405.0
Bump aws-sdk-ec2 from 1.404.0 to 1.405.0
2023-09-18 12:58:10 -04:00
dependabot[bot]
fb3d682b4e
Bump aws-sdk-ec2 from 1.404.0 to 1.405.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.404.0 to 1.405.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-18 15:37:59 +00:00
Jake Spain
bfbe50d718
Merge pull request #38 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.404.0
Bump aws-sdk-ec2 from 1.399.0 to 1.404.0
2023-09-11 11:12:18 -04:00
dependabot[bot]
ac9bc1ab91
Bump aws-sdk-ec2 from 1.399.0 to 1.404.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.399.0 to 1.404.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-11 15:07:31 +00:00
Jake Spain
44c2edc24f
Merge pull request #36 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.399.0
Bump aws-sdk-ec2 from 1.397.0 to 1.399.0
2023-08-21 11:40:20 -04:00
dependabot[bot]
c5ed155b9b
Bump aws-sdk-ec2 from 1.397.0 to 1.399.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.397.0 to 1.399.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-21 15:23:55 +00:00
isaac-hammes
8e82f009c9
Merge pull request #35 from puppetlabs/POD-10
(POD-10) Log reason for failed VM checks.
2023-08-18 05:24:14 -07:00
isaac-hammes
58a06bfbfa (POD-10) Log reason for failed VM checks. 2023-08-17 13:17:25 -07:00
Jake Spain
99c288db9c
Merge pull request #34 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.397.0
Bump aws-sdk-ec2 from 1.396.0 to 1.397.0
2023-08-14 13:18:28 -04:00
dependabot[bot]
7506872596
Bump aws-sdk-ec2 from 1.396.0 to 1.397.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.396.0 to 1.397.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-14 15:10:41 +00:00
Jake Spain
673a6fb5de
Merge pull request #33 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.396.0
Bump aws-sdk-ec2 from 1.381.0 to 1.396.0
2023-08-09 14:44:07 -04:00
dependabot[bot]
bdd00e6d05
Bump aws-sdk-ec2 from 1.381.0 to 1.396.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.381.0 to 1.396.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-07 15:45:34 +00:00
Jake Spain
a23f664685
Merge pull request #24 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.381.0
Bump aws-sdk-ec2 from 1.380.0 to 1.381.0
2023-06-05 08:20:14 -04:00
dependabot[bot]
5733373200
Bump aws-sdk-ec2 from 1.380.0 to 1.381.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.380.0 to 1.381.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-05 12:15:43 +00:00
Jake Spain
2370b425ef
Merge pull request #23 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.380.0
Bump aws-sdk-ec2 from 1.379.0 to 1.380.0
2023-06-05 08:07:41 -04:00
dependabot[bot]
456c8a226d
Bump aws-sdk-ec2 from 1.379.0 to 1.380.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.379.0 to 1.380.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-22 16:02:25 +00:00
Jake Spain
fd449be206
Merge pull request #22 from puppetlabs/dependabot/bundler/thor-1.2.2
Bump thor from 1.2.1 to 1.2.2
2023-05-15 14:39:12 -04:00
dependabot[bot]
56348c5f1d
Bump thor from 1.2.1 to 1.2.2
Bumps [thor](https://github.com/rails/thor) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/rails/thor/releases)
- [Commits](https://github.com/rails/thor/compare/v1.2.1...v1.2.2)

---
updated-dependencies:
- dependency-name: thor
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-15 16:00:39 +00:00
Jake Spain
4049e96889
Merge pull request #21 from puppetlabs/dependabot/bundler/rubocop-1.50.2
Update rubocop requirement from ~> 1.28.2 to ~> 1.50.2
2023-05-09 14:01:58 -04:00
Jake Spain
03ac1e9b03
Merge pull request #20 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.379.0
Bump aws-sdk-ec2 from 1.378.0 to 1.379.0
2023-05-09 14:01:23 -04:00
dependabot[bot]
f28558b3f6
Update rubocop requirement from ~> 1.28.2 to ~> 1.50.2
Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.28.2...v1.50.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-08 16:05:18 +00:00
dependabot[bot]
740f4b50ad
Bump aws-sdk-ec2 from 1.378.0 to 1.379.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.378.0 to 1.379.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-08 15:59:54 +00:00
Jake Spain
d3940ee71f
Merge pull request #19 from puppetlabs/dependabot/bundler/aws-sdk-ec2-1.378.0
Bump aws-sdk-ec2 from 1.361.0 to 1.378.0
2023-05-05 08:13:54 -04:00
dependabot[bot]
44d2e438e6
Bump aws-sdk-ec2 from 1.361.0 to 1.378.0
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.361.0 to 1.378.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-05 12:12:04 +00:00
Jake Spain
6bfe95d271
Merge pull request #14 from puppetlabs/dependabot/bundler/rack-test-2.1.0
Bump rack-test from 2.0.2 to 2.1.0
2023-05-05 08:11:34 -04:00
dependabot[bot]
4847398547
Bump rack-test from 2.0.2 to 2.1.0
Bumps [rack-test](https://github.com/rack/rack-test) from 2.0.2 to 2.1.0.
- [Release notes](https://github.com/rack/rack-test/releases)
- [Changelog](https://github.com/rack/rack-test/blob/main/History.md)
- [Commits](https://github.com/rack/rack-test/compare/v2.0.2...v2.1.0)

---
updated-dependencies:
- dependency-name: rack-test
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 16:04:02 +00:00
Jake Spain
380814bbb0
Merge pull request #13 from puppetlabs/update-actions
Add docs and update actions
2023-01-30 16:52:01 -05:00
Jake Spain
c2582e9fb2
Add platform universal-java-11 to lockfile 2023-01-30 15:13:38 -05:00
Jake Spain
4287880807
vmpooler should be a dependency 2023-01-30 15:13:32 -05:00
Jake Spain
845de6b353
Add changelog and release instructions 2023-01-30 10:08:29 -05:00
Jake Spain
b672364a53
Update release workflow 2023-01-30 10:08:23 -05:00
Jake Spain
1bba644da5
Add jruby-9.4 to testing 2023-01-30 09:08:16 -05:00
Jake Spain
b418940998
Merge pull request #12 from puppetlabs/add-mend
(RE-15111) Migrate Snyk to Mend Scanning
2023-01-20 14:48:35 -05:00
Jake Spain
7f6eaf1f4e
Migrate Snyk to Mend Scanning 2023-01-20 12:42:20 -05:00
Jake Spain
d2ecc03d9a
Change dependabot to weekly 2023-01-19 21:10:30 -05:00
Jake Spain
4ee1abb54f
Merge pull request #11 from puppetlabs/update_codeowners
(RE-14811) Remove DIO as codeowners
2022-08-26 10:35:08 -04:00
Jake Spain
3c8dc0257f
Remove DIO as codeowners 2022-08-26 09:43:11 -04:00
Jake Spain
5148c318cd
Merge pull request #10 from puppetlabs/migrate_snyk
Add Snyk action
2022-08-18 10:11:46 -04:00
Jake Spain
c81f3327af
Add Snyk action 2022-08-16 17:30:48 -04:00
Jake Spain
729a2981b7
Merge pull request #9 from puppetlabs/update-codeowners
Add release-engineering to codeowners
2022-08-08 15:03:45 -04:00
Jake Spain
0a6e61fe0e
Add release-engineering to codeowners 2022-08-08 14:36:51 -04:00
16 changed files with 495 additions and 19 deletions

View file

@ -3,6 +3,11 @@ updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
time: "13:00"
interval: weekly
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10

12
.github/workflows/auto_release_prep.yml vendored Normal file
View file

@ -0,0 +1,12 @@
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

View file

@ -0,0 +1,8 @@
name: Dependabot auto-merge
on: pull_request
jobs:
dependabot_merge:
uses: puppetlabs/release-engineering-repo-standards/.github/workflows/dependabot_merge.yml@v1
secrets: inherit

8
.github/workflows/ensure_label.yml vendored Normal file
View file

@ -0,0 +1,8 @@
name: Ensure label
on: pull_request
jobs:
ensure_label:
uses: puppetlabs/release-engineering-repo-standards/.github/workflows/ensure_label.yml@v1
secrets: inherit

View file

@ -1,4 +1,4 @@
name: Release
name: Release Gem
on: workflow_dispatch
@ -7,25 +7,77 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'puppetlabs/vmpooler-provider-ec2'
steps:
- uses: actions/checkout@v2
- name: Get Version
id: gv
- 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
run: |
echo "::set-output name=ver::$(grep VERSION lib/vmpooler-provider-ec2/version.rb |rev |cut -d "'" -f2 |rev)"
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 }}
- name: Tag Release
uses: ncipollo/release-action@v1
with:
tag: ${{ steps.gv.outputs.ver }}
tag: ${{ steps.nv.outputs.version }}
token: ${{ secrets.GITHUB_TOKEN }}
bodyfile: release-notes.md
draft: false
prerelease: false
generateReleaseNotes: true
# This step should closely match what is used in `docker/Dockerfile` in vmpooler-deployment
- 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

39
.github/workflows/security.yml vendored Normal file
View file

@ -0,0 +1,39 @@
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 }}

View file

@ -19,8 +19,9 @@ jobs:
matrix:
ruby-version:
- 'jruby-9.3.6.0'
- 'jruby-9.4.0.0'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
@ -35,8 +36,9 @@ jobs:
matrix:
ruby-version:
- 'jruby-9.3.6.0'
- 'jruby-9.4.0.0'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:

View file

@ -0,0 +1,3 @@
project=vmpooler-provider-ec2
user=puppetlabs
exclude_labels=maintenance

37
CHANGELOG.md Normal file
View file

@ -0,0 +1,37 @@
# 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)*

View file

@ -1,2 +1,2 @@
# added by slack-gitbot
* @puppetlabs/dio
* @puppetlabs/release-engineering

264
Gemfile.lock Normal file
View file

@ -0,0 +1,264 @@
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

View file

@ -1,5 +1,15 @@
# 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.
@ -55,6 +65,22 @@ 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 <https://rubygems.org>.
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.

View file

@ -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)
def vm_ready?(pool_name, vm_name, redis)
begin
domain_set = domain
if domain_set.nil?
@ -415,9 +415,10 @@ module Vmpooler
end
open_socket(vm_name, domain_set)
rescue StandardError => e
@logger.log('s', "[!] [#{pool_name}] '#{vm_name}' instance cannot be reached by vmpooler on tcp port 22; #{e}")
redis.hset("vmpooler__vm__#{vm_name}", 'open_socket_error', e.to_s)
return false
end
redis.hdel("vmpooler__vm__#{vm_name}", 'open_socket_error')
true
end

14
release-prep Executable file
View file

@ -0,0 +1,14 @@
#!/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)

7
update-gemfile-lock Executable file
View file

@ -0,0 +1,7 @@
#!/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=$?"'

View file

@ -17,10 +17,8 @@ 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_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'
s.add_dependency 'vmpooler', '>= 1.3.0', '~> 2.3'
s.add_dependency 'vmpooler-provider-gce', '>= 0.4.0', '~> 0.4'
# Testing dependencies
s.add_development_dependency 'climate_control', '>= 0.2.0'
@ -28,7 +26,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.28.2'
s.add_development_dependency 'rubocop', '~> 1.50.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'