mirror of
https://github.com/puppetlabs/vmfloaty.git
synced 2026-01-26 05:28:40 -05:00
Compare commits
No commits in common. "main" and "1.8.0" have entirely different histories.
14 changed files with 68 additions and 129 deletions
26
.github/dependabot.yml
vendored
26
.github/dependabot.yml
vendored
|
|
@ -1,19 +1,13 @@
|
||||||
version: 2
|
version: 2
|
||||||
updates:
|
updates:
|
||||||
- package-ecosystem: bundler
|
- package-ecosystem: "github-actions"
|
||||||
directory: "/"
|
directory: "/"
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: "weekly"
|
||||||
open-pull-requests-limit: 10
|
open-pull-requests-limit: 10
|
||||||
|
|
||||||
- package-ecosystem: docker
|
- package-ecosystem: bundler
|
||||||
directory: "/"
|
directory: "/"
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: weekly
|
||||||
open-pull-requests-limit: 10
|
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
12
.github/workflows/auto_release_prep.yml
vendored
|
|
@ -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/vmfloaty/version.rb
|
|
||||||
8
.github/workflows/dependabot_merge.yml
vendored
8
.github/workflows/dependabot_merge.yml
vendored
|
|
@ -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
|
|
||||||
8
.github/workflows/ensure_label.yml
vendored
8
.github/workflows/ensure_label.yml
vendored
|
|
@ -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
|
|
||||||
10
.github/workflows/release.yml
vendored
10
.github/workflows/release.yml
vendored
|
|
@ -15,7 +15,7 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.ref }}
|
ref: ${{ github.ref }}
|
||||||
clean: true
|
clean: true
|
||||||
|
|
@ -29,7 +29,7 @@ jobs:
|
||||||
echo "Found version $version from lib/vmfloaty/version.rb"
|
echo "Found version $version from lib/vmfloaty/version.rb"
|
||||||
|
|
||||||
- name: Get Current Version
|
- name: Get Current Version
|
||||||
uses: actions/github-script@v7
|
uses: actions/github-script@v6
|
||||||
id: cv
|
id: cv
|
||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
|
|
@ -82,17 +82,17 @@ jobs:
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
|
|
|
||||||
4
.github/workflows/security.yml
vendored
4
.github/workflows/security.yml
vendored
|
|
@ -11,7 +11,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: checkout repo content
|
- name: checkout repo content
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
- name: setup ruby
|
- name: setup ruby
|
||||||
|
|
@ -22,7 +22,7 @@ jobs:
|
||||||
- name: check lock
|
- name: check lock
|
||||||
run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock'
|
run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock'
|
||||||
# install java
|
# install java
|
||||||
- uses: actions/setup-java@v4
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin' # See 'Supported distributions' for available options
|
distribution: 'temurin' # See 'Supported distributions' for available options
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
|
|
|
||||||
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
- '3.2'
|
- '3.2'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v3
|
||||||
- name: Set up Ruby
|
- name: Set up Ruby
|
||||||
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
|
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
|
||||||
# change this to (see https://github.com/ruby/setup-ruby#versioning):
|
# change this to (see https://github.com/ruby/setup-ruby#versioning):
|
||||||
|
|
|
||||||
20
CHANGELOG.md
20
CHANGELOG.md
|
|
@ -1,25 +1,5 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## [1.8.1](https://github.com/puppetlabs/vmfloaty/tree/1.8.1) (2023-08-07)
|
|
||||||
|
|
||||||
[Full Changelog](https://github.com/puppetlabs/vmfloaty/compare/1.8.0...1.8.1)
|
|
||||||
|
|
||||||
**Fixed bugs:**
|
|
||||||
|
|
||||||
- status and summary broken for pooler service after v3 [\#185](https://github.com/puppetlabs/vmfloaty/issues/185)
|
|
||||||
- \(RE-15687\) Use relative path for pooler status and summary [\#186](https://github.com/puppetlabs/vmfloaty/pull/186) ([yachub](https://github.com/yachub))
|
|
||||||
|
|
||||||
**Merged pull requests:**
|
|
||||||
|
|
||||||
- Bump rubocop from 1.54.2 to 1.55.1 [\#183](https://github.com/puppetlabs/vmfloaty/pull/183) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
- Bump rubocop from 1.52.0 to 1.54.2 [\#182](https://github.com/puppetlabs/vmfloaty/pull/182) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
- Bump rubocop from 1.51.0 to 1.52.0 [\#177](https://github.com/puppetlabs/vmfloaty/pull/177) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
- Bump rubocop from 1.50.2 to 1.51.0 [\#176](https://github.com/puppetlabs/vmfloaty/pull/176) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
- Bump rubocop from 1.49.0 to 1.50.2 [\#174](https://github.com/puppetlabs/vmfloaty/pull/174) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
- Bump rubocop from 1.48.1 to 1.49.0 [\#173](https://github.com/puppetlabs/vmfloaty/pull/173) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
- Update simplecov requirement from ~\> 0.21.2 to ~\> 0.22.0 [\#167](https://github.com/puppetlabs/vmfloaty/pull/167) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
- Update rspec requirement from ~\> 3.11.0 to ~\> 3.12.0 [\#166](https://github.com/puppetlabs/vmfloaty/pull/166) ([dependabot[bot]](https://github.com/apps/dependabot))
|
|
||||||
|
|
||||||
## [1.8.0](https://github.com/puppetlabs/vmfloaty/tree/1.8.0) (2023-03-21)
|
## [1.8.0](https://github.com/puppetlabs/vmfloaty/tree/1.8.0) (2023-03-21)
|
||||||
|
|
||||||
[Full Changelog](https://github.com/puppetlabs/vmfloaty/compare/1.7.0...1.8.0)
|
[Full Changelog](https://github.com/puppetlabs/vmfloaty/compare/1.7.0...1.8.0)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:3.3.5-slim-bullseye
|
FROM ruby:3.1.3-slim-bullseye
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="@puppetlabs/release-engineering"
|
LABEL org.opencontainers.image.authors="@puppetlabs/release-engineering"
|
||||||
LABEL org.opencontainers.image.title="vmfloaty"
|
LABEL org.opencontainers.image.title="vmfloaty"
|
||||||
|
|
|
||||||
10
Gemfile
10
Gemfile
|
|
@ -7,12 +7,12 @@ gemspec
|
||||||
gem 'rake', require: false
|
gem 'rake', require: false
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem 'simplecov', '~> 0.22.0'
|
gem 'simplecov', '~> 0.21.2'
|
||||||
gem 'simplecov-html', '~> 0.13.1'
|
gem 'simplecov-html', '~> 0.12.3'
|
||||||
gem 'simplecov-lcov', '~> 0.8.0'
|
gem 'simplecov-lcov', '~> 0.8.0'
|
||||||
gem 'pry'
|
gem 'pry'
|
||||||
gem 'rb-readline'
|
gem 'rb-readline'
|
||||||
gem 'rspec', '~> 3.13.0'
|
gem 'rspec', '~> 3.11.0'
|
||||||
gem 'rubocop', '~> 1.66'
|
gem 'rubocop', '~> 1.6'
|
||||||
gem 'webmock', '~> 3.23'
|
gem 'webmock', '~> 3.13'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
85
Gemfile.lock
85
Gemfile.lock
|
|
@ -1,24 +1,22 @@
|
||||||
PATH
|
PATH
|
||||||
remote: .
|
remote: .
|
||||||
specs:
|
specs:
|
||||||
vmfloaty (1.8.1)
|
vmfloaty (1.8.0)
|
||||||
commander (>= 4.4.3, < 4.7.0)
|
commander (>= 4.4.3, < 4.7.0)
|
||||||
faraday (~> 1.5, >= 1.5.1)
|
faraday (~> 1.5, >= 1.5.1)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
addressable (2.8.6)
|
addressable (2.8.1)
|
||||||
public_suffix (>= 2.0.2, < 6.0)
|
public_suffix (>= 2.0.2, < 6.0)
|
||||||
ast (2.4.2)
|
ast (2.4.2)
|
||||||
bigdecimal (3.1.8)
|
|
||||||
coderay (1.1.3)
|
coderay (1.1.3)
|
||||||
commander (4.6.0)
|
commander (4.6.0)
|
||||||
highline (~> 2.0.0)
|
highline (~> 2.0.0)
|
||||||
crack (1.0.0)
|
crack (0.4.5)
|
||||||
bigdecimal
|
|
||||||
rexml
|
rexml
|
||||||
diff-lcs (1.5.1)
|
diff-lcs (1.5.0)
|
||||||
docile (1.4.0)
|
docile (1.4.0)
|
||||||
faraday (1.10.3)
|
faraday (1.10.3)
|
||||||
faraday-em_http (~> 1.0)
|
faraday-em_http (~> 1.0)
|
||||||
|
|
@ -43,64 +41,59 @@ GEM
|
||||||
faraday-patron (1.0.0)
|
faraday-patron (1.0.0)
|
||||||
faraday-rack (1.0.0)
|
faraday-rack (1.0.0)
|
||||||
faraday-retry (1.0.3)
|
faraday-retry (1.0.3)
|
||||||
hashdiff (1.1.0)
|
hashdiff (1.0.1)
|
||||||
highline (2.0.3)
|
highline (2.0.3)
|
||||||
json (2.7.2)
|
json (2.6.3)
|
||||||
language_server-protocol (3.17.0.3)
|
|
||||||
method_source (1.0.0)
|
method_source (1.0.0)
|
||||||
multipart-post (2.3.0)
|
multipart-post (2.3.0)
|
||||||
parallel (1.26.3)
|
parallel (1.22.1)
|
||||||
parser (3.3.5.0)
|
parser (3.2.1.1)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
racc
|
|
||||||
pry (0.14.2)
|
pry (0.14.2)
|
||||||
coderay (~> 1.1)
|
coderay (~> 1.1)
|
||||||
method_source (~> 1.0)
|
method_source (~> 1.0)
|
||||||
public_suffix (5.0.5)
|
public_suffix (5.0.1)
|
||||||
racc (1.8.1)
|
|
||||||
rainbow (3.1.1)
|
rainbow (3.1.1)
|
||||||
rake (13.2.1)
|
rake (13.0.6)
|
||||||
rb-readline (0.5.5)
|
rb-readline (0.5.5)
|
||||||
regexp_parser (2.9.2)
|
regexp_parser (2.7.0)
|
||||||
rexml (3.3.6)
|
rexml (3.2.5)
|
||||||
strscan
|
rspec (3.11.0)
|
||||||
rspec (3.13.0)
|
rspec-core (~> 3.11.0)
|
||||||
rspec-core (~> 3.13.0)
|
rspec-expectations (~> 3.11.0)
|
||||||
rspec-expectations (~> 3.13.0)
|
rspec-mocks (~> 3.11.0)
|
||||||
rspec-mocks (~> 3.13.0)
|
rspec-core (3.11.0)
|
||||||
rspec-core (3.13.0)
|
rspec-support (~> 3.11.0)
|
||||||
rspec-support (~> 3.13.0)
|
rspec-expectations (3.11.1)
|
||||||
rspec-expectations (3.13.0)
|
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.13.0)
|
rspec-support (~> 3.11.0)
|
||||||
rspec-mocks (3.13.0)
|
rspec-mocks (3.11.2)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.13.0)
|
rspec-support (~> 3.11.0)
|
||||||
rspec-support (3.13.0)
|
rspec-support (3.11.1)
|
||||||
rubocop (1.66.1)
|
rubocop (1.48.1)
|
||||||
json (~> 2.3)
|
json (~> 2.3)
|
||||||
language_server-protocol (>= 3.17.0)
|
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
parser (>= 3.3.0.2)
|
parser (>= 3.2.0.0)
|
||||||
rainbow (>= 2.2.2, < 4.0)
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
regexp_parser (>= 2.4, < 3.0)
|
regexp_parser (>= 1.8, < 3.0)
|
||||||
rubocop-ast (>= 1.32.2, < 2.0)
|
rexml (>= 3.2.5, < 4.0)
|
||||||
|
rubocop-ast (>= 1.26.0, < 2.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (>= 2.4.0, < 3.0)
|
unicode-display_width (>= 2.4.0, < 3.0)
|
||||||
rubocop-ast (1.32.3)
|
rubocop-ast (1.27.0)
|
||||||
parser (>= 3.3.1.0)
|
parser (>= 3.2.1.0)
|
||||||
ruby-progressbar (1.13.0)
|
ruby-progressbar (1.13.0)
|
||||||
ruby2_keywords (0.0.5)
|
ruby2_keywords (0.0.5)
|
||||||
simplecov (0.22.0)
|
simplecov (0.21.2)
|
||||||
docile (~> 1.1)
|
docile (~> 1.1)
|
||||||
simplecov-html (~> 0.11)
|
simplecov-html (~> 0.11)
|
||||||
simplecov_json_formatter (~> 0.1)
|
simplecov_json_formatter (~> 0.1)
|
||||||
simplecov-html (0.13.1)
|
simplecov-html (0.12.3)
|
||||||
simplecov-lcov (0.8.0)
|
simplecov-lcov (0.8.0)
|
||||||
simplecov_json_formatter (0.1.4)
|
simplecov_json_formatter (0.1.4)
|
||||||
strscan (3.1.0)
|
unicode-display_width (2.4.2)
|
||||||
unicode-display_width (2.5.0)
|
webmock (3.18.1)
|
||||||
webmock (3.23.1)
|
|
||||||
addressable (>= 2.8.0)
|
addressable (>= 2.8.0)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff (>= 0.4.0, < 2.0.0)
|
hashdiff (>= 0.4.0, < 2.0.0)
|
||||||
|
|
@ -113,13 +106,13 @@ DEPENDENCIES
|
||||||
pry
|
pry
|
||||||
rake
|
rake
|
||||||
rb-readline
|
rb-readline
|
||||||
rspec (~> 3.13.0)
|
rspec (~> 3.11.0)
|
||||||
rubocop (~> 1.66)
|
rubocop (~> 1.6)
|
||||||
simplecov (~> 0.22.0)
|
simplecov (~> 0.21.2)
|
||||||
simplecov-html (~> 0.13.1)
|
simplecov-html (~> 0.12.3)
|
||||||
simplecov-lcov (~> 0.8.0)
|
simplecov-lcov (~> 0.8.0)
|
||||||
vmfloaty!
|
vmfloaty!
|
||||||
webmock (~> 3.23)
|
webmock (~> 3.13)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.4.8
|
2.4.8
|
||||||
|
|
|
||||||
|
|
@ -146,14 +146,14 @@ class Pooler
|
||||||
def self.status(verbose, url)
|
def self.status(verbose, url)
|
||||||
conn = Http.get_conn(verbose, url)
|
conn = Http.get_conn(verbose, url)
|
||||||
|
|
||||||
response = conn.get 'status'
|
response = conn.get '/status'
|
||||||
JSON.parse(response.body)
|
JSON.parse(response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.summary(verbose, url)
|
def self.summary(verbose, url)
|
||||||
conn = Http.get_conn(verbose, url)
|
conn = Http.get_conn(verbose, url)
|
||||||
|
|
||||||
response = conn.get 'summary'
|
response = conn.get '/summary'
|
||||||
JSON.parse(response.body)
|
JSON.parse(response.body)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class Vmfloaty
|
class Vmfloaty
|
||||||
VERSION = '1.8.1'
|
VERSION = '1.8.0'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
# bundle install
|
# bundle install
|
||||||
docker run -t --rm \
|
docker run -it --rm \
|
||||||
-v $(pwd):/app \
|
-v $(pwd):/app \
|
||||||
$(grep ^FROM ./Dockerfile |cut -d ' ' -f2) \
|
$(grep ^FROM ./Dockerfile |cut -d ' ' -f2) \
|
||||||
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends build-essential make openssh-client && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
|
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends build-essential make openssh-client && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
|
||||||
|
|
||||||
# Update Changelog
|
# Update Changelog
|
||||||
docker run -t --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
|
docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
|
||||||
githubchangeloggenerator/github-changelog-generator:1.16.2 \
|
githubchangeloggenerator/github-changelog-generator:1.16.2 \
|
||||||
github_changelog_generator --future-release $(grep VERSION lib/vmfloaty/version.rb |rev |cut -d "'" -f2 |rev)
|
github_changelog_generator --future-release $(grep VERSION lib/vmfloaty/version.rb |rev |cut -d "'" -f2 |rev)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue