foreman_envsync 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 237034826a5908b26cf6c4c6404ff49cc88a328b7b5c6934d9771197026c4860
-  data.tar.gz: 59c58d3e01675713f92d53a445ccede11fb56324d431598d494144281a7a5aca
+  metadata.gz: 9a1b0dd3d8f5949db44605891c54f2d4a937b2b194b182ef0dd5887b8632d6d1
+  data.tar.gz: a576b9c27487cba2a37fe9be7bcf6fd96e92cd7fc71a476cccbbe2e210b04b6c
 SHA512:
-  metadata.gz: 9eea85c919db3abb85cebefdfd5a87d0ab7e1ecaf12c1733e0e9bbee9c67e9d053a30c0aaeaaa46c6dcdb7319fb36b494407aa598dccc6cd8ee8aa990fb8d37c
-  data.tar.gz: c917d93841accedb333ff01dd8011663a819e8e9e3303a822c562a174a949a9bf646ee56b6670b36da26127bdbf66b9371b11c3f0d9f698670b0a6e46379fda0
+  metadata.gz: ca9ac65592854fadd6601e66167dd999d42205334973a14af4d3105b40c8a4b9b345d4517b5c82f922a51959eaae70aeeb9ff38893395e7d03b866150493a3c8
+  data.tar.gz: eede0daddd896ba75db5b30325c1222982abd7e095e2c3e329c4c9538106cd238cee5c92e2f6c118ef28533a0f297d7a318856528da774e88928f6ac8e254c01

data/.github/workflows/ci.yaml

@@ -0,0 +1,61 @@
+# based on https://github.com/docker/build-push-action/blob/master/docs/advanced/tags-labels.md
+
+name: ci
+
+on:
+  schedule:
+    - cron: '0 10 * * 1'
+  push:
+    branches:
+      - '**'
+    tags:
+      - 'v*.*.*'
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    if: github.repository == 'lsst-it/foreman_envsync'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: true
+      - name: Run the default task
+        run: bundle exec rake
+      - name: Build gem
+        run: gem build *.gemspec
+      - name: Publish gem to rubygems.org
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: gem push *.gem
+        env:
+          GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            lsstit/foreman_envsync
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_LSSTIT_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_LSSTIT_PASSWORD }}
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+*.gem
 
 # rspec failure tracking
 .rspec_status

data/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:3.0
+
+COPY *.gem .
+RUN gem install --no-document *.gem
+
+ENTRYPOINT ["/usr/local/bundle/bin/foreman_envsync"]

data/README.md

@@ -4,6 +4,11 @@ A highly opinionated utility to sync foreman puppet environments with the set
 of environments known to a `puppetserver` instance *without* also importing the
 classes within those puppet environments.
 
+## OCI Image
+
+An OCI image containing this gem is published to docker hub as
+[`lsstit/foreman_envsync`](https://hub.docker.com/repository/docker/lsstit/foreman_envsync).
+
 
 ## The Problem
 

data/exe/foreman_envsync

@@ -30,7 +30,7 @@ def verbose_list(msg, items)
 
   printf(msg, items.count)
   puts
-  puts "#{YAML.dump(items)}\n" unless items.empty?
+  puts "#{YAML.dump(items.sort)}\n" unless items.empty?
 end
 
 def cert_file(file)
@@ -41,21 +41,21 @@ def key_file(file)
   OpenSSL::PKey::RSA.new(File.read(file))
 end
 
-def hammer_cmd(cmd)
+def hammer_cmd(cmd, opt = { ignore_exitstatus: false })
   stdout, stderr, s = Open3.capture3(cmd)
   unless s.success?
     puts "command #{cmd} failed"
     puts stderr
-    exit s.exitstatus
+    exit s.exitstatus unless opt[:ignore_exitstatus]
   end
 
   stdout
 end
 
-def hammer_cmd_parse(cmd)
-  stdout = hammer_cmd(cmd)
+def hammer_cmd_parse(cmd, **opt)
+  stdout = hammer_cmd(cmd, opt)
 
-  JSON.parse(stdout)
+  JSON.parse(stdout) unless stdout.empty?
 end
 
 def collect_one_field(data, field)
@@ -78,7 +78,7 @@ end
 def foreman_env_delete(name)
   cmd = "hammer --output=json puppet-environment delete --name #{name}"
 
-  hammer_cmd_parse(cmd)
+  hammer_cmd_parse(cmd, ignore_exitstatus: true)
 end
 
 def foreman_env_create(name, location_ids, org_ids)
@@ -143,7 +143,7 @@ verbose_list "found %d foreman environment(s) unknown to puppetserver.", extra_e
 # Remove any foreman envs unknown to puppetserver
 #
 report = extra_envs.collect { |x| foreman_env_delete(x) } unless extra_envs.empty?
-verbose_list "deleted %d foreman environment(s).", report
+verbose_list "deleted %d foreman environment(s).", report.nil? ? nil : report.compact
 
 # update foreman envs if anything was deleted
 f_envs = foreman_env_list unless report.nil?

data/foreman_envsync.gemspec

@@ -28,10 +28,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "hammer_cli"
   spec.add_runtime_dependency "hammer_cli_foreman"
+  spec.add_runtime_dependency "hammer_cli_foreman_puppet"
   spec.add_runtime_dependency "rest-client", "~> 2.0"
   spec.add_development_dependency "rubocop-rake"
   spec.add_development_dependency "rubocop-rspec"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/foreman_envsync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanEnvsync
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_envsync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Joshua Hoblitt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hammer_cli_foreman_puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -88,11 +102,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,6 +125,7 @@ metadata:
   homepage_uri: https://github.com/lsst-it/foreman_envsync
   source_code_uri: https://github.com/lsst-it/foreman_envsync
   changelog_uri: https://github.com/lsst-it/foreman_envsync/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -125,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Sync pupperserver envs with foreman

data/.github/workflows/main.yml

@@ -1,16 +0,0 @@
-name: Ruby
-
-on: [push,pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7.2
-        bundler-cache: true
-    - name: Run the default task
-      run: bundle exec rake