k8s-ruby 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88dee10d641080bb5896aab32b8fd522415ce8e94a2135d68b06a3b9467ab6f8
-  data.tar.gz: 36d072c3d850a13419a1964afa0934494b220e3a9b82c359699ce13cf417356a
+  metadata.gz: 852ad2775ba818eac10ac0cfd9f1e362e1390526102e7c6e0d46b4941e153dc6
+  data.tar.gz: 83ef7dc2a19aa6abcc703161f715ce3d4b14732546ec5025991fbcc9d1440b47
 SHA512:
-  metadata.gz: 278cf65ef4d9795795b31352720831f82b90110a8463d6f792eddd6c8357e1549d70d859d113e042f1ef6543b2b43bd0d1aa07e178dbfbdd279bcc6d25907f51
-  data.tar.gz: 104f06d0534076270881b857f85b180c13cd8fe3a6b995f1335a69ae57844abc3f01f3665c58748b33791537173de0de35d9b09e7b7f3d0b4cefac61586ba2c3
+  metadata.gz: ffac9cb78159e00e5a84c8e81d60981f2a67f05a414e382599761e6c83f44ffc468e1367862225f3c652a69ff8265deba09a5525631a2f67dc12cefef69e1717
+  data.tar.gz: '087453bd8f6650b2db503e286c17f4ee3455bb9b376a13c04bfe145ae48ddcef9f31563f5f64d0e88dd2e52302a0888767c91e7a03b43a045f57bb4261095ea3'

data/.github/workflows/tests.yml

@@ -0,0 +1,26 @@
+name: tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build-2-6:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: docker-compose up --build rspec-2.6
+
+  build-2-7:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: docker-compose up --build rspec-2.7
+
+  build-3-0:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: docker-compose up --build rspec-3.0

data/.gitignore

@@ -6,8 +6,9 @@
 /pkg/
 /spec/reports/
 /tmp/
-Gemfile.lock
+
 .ruby-version
+.tool-versions
 /.byebug_history
 
 # rspec failure tracking

data/Dockerfile

@@ -1,15 +1,15 @@
 ARG BASE_IMAGE=ruby:2.7
 FROM ${BASE_IMAGE}
 
+RUN gem install bundler:2.3.5
+
 WORKDIR /app
 
 COPY Gemfile *.gemspec ./
 COPY lib/k8s/ruby/version.rb ./lib/k8s/ruby/
 
-RUN gem install bundler:2.3.4
 RUN bundle install
 RUN bundle update --bundler
 
 COPY . .
-
-ENTRYPOINT ["bundle", "exec"]
+ENTRYPOINT ["/app/entrypoint.sh"]

data/Gemfile.lock

@@ -0,0 +1,117 @@
+PATH
+  remote: .
+  specs:
+    k8s-ruby (0.13.0)
+      dry-configurable (~> 0.13.0)
+      dry-struct (<= 1.6.0)
+      dry-types (<= 1.7.0)
+      excon (~> 0.71)
+      hashdiff (~> 1.0.0)
+      jsonpath (~> 0.9.5)
+      recursive-open-struct (~> 1.1.3)
+      yajl-ruby (~> 1.4.0)
+      yaml-safe_load_stream2 (~> 0.1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    dry-configurable (0.13.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.6)
+    dry-container (0.11.0)
+      concurrent-ruby (~> 1.0)
+    dry-core (0.9.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (0.3.0)
+    dry-logic (1.3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.9, >= 0.9)
+      zeitwerk (~> 2.6)
+    dry-struct (1.5.2)
+      dry-core (~> 0.9, >= 0.9)
+      dry-types (~> 1.6)
+      ice_nine (~> 0.11)
+      zeitwerk (~> 2.6)
+    dry-types (1.6.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.9, >= 0.9)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.3, >= 1.3)
+      zeitwerk (~> 2.6)
+    excon (0.94.0)
+    hashdiff (1.0.1)
+    ice_nine (0.11.2)
+    jsonpath (0.9.9)
+      multi_json
+      to_regexp (~> 0.2.1)
+    multi_json (1.15.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    public_suffix (5.0.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    recursive-open-struct (1.1.3)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    to_regexp (0.2.1)
+    unicode-display_width (1.8.0)
+    webmock (3.6.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yajl-ruby (1.4.3)
+    yaml-safe_load_stream2 (0.1.1)
+    zeitwerk (2.6.6)
+
+PLATFORMS
+  aarch64-linux
+  arm64-darwin-21
+  x86_64-darwin-21
+
+DEPENDENCIES
+  bundler (>= 1.17, < 3.0)
+  byebug (~> 11.1)
+  k8s-ruby!
+  rake (>= 12.3.3)
+  rspec (~> 3.7)
+  rubocop (~> 0.82)
+  webmock (~> 3.6.2)
+
+BUNDLED WITH
+   2.3.26

data/README.md

@@ -32,11 +32,11 @@ gem 'k8s-ruby'
 
 And then execute:
 
-    $ bundle
+    bundle
 
 Or install it yourself as:
 
-    $ gem install k8s-ruby
+    gem install k8s-ruby
 
 And then load the code using:
 
@@ -47,6 +47,7 @@ require 'k8s-ruby'
 ## Usage
 
 ### Overview
+
 The top-level `K8s::Client` provides access to separate `APIClient` instances for each Kubernetes API Group (`v1`, `apps/v1`, etc.), which in turns provides access to separate `ResourceClient` instances for each API resource type (`nodes`, `pods`, `deployments`, etc.).
 
 Individual resources are returned as `K8s::Resource` instances, which are `RecursiveOpenStruct` instances providing attribute access (`resource.metadata.name`). The resource instances are returned by methods such as `client.api('v1').resource('nodes').get('foo')`, and passed as arguments for `client.api('v1').resource('nodes').create_resource(res)`. Resources can also be loaded from disk using `K8s::Resource.from_files(path)`, and passed to the top-level methods such as `client.create_resource(res)`, which lookup the correct API/Resource client from the resource `apiVersion` and `kind`.
@@ -174,8 +175,9 @@ pods = client.api('v1').resource('pods', namespace: 'default').delete_collection
 ### Creating resources
 
 #### Programmatically defined resources
+
 ```ruby
-service = K8s::Resource.new(
+service = K8s::Resource.new({
   apiVersion: 'v1',
   kind: 'Service',
   metadata: {
@@ -189,7 +191,7 @@ service = K8s::Resource.new(
     ],
     selector: {'app' => 'test'},
   },
-)
+})
 
 logger.info "Create service=#{service.metadata.name} in namespace=#{service.metadata.namespace}"
 

data/docker-compose.yaml

@@ -6,8 +6,6 @@ services:
         BASE_IMAGE: ruby:2.6
     volumes:
       - .:/app
-    entrypoint: bundle exec rspec
-
   rspec-2.7:
     build:
       context: .
@@ -15,13 +13,10 @@ services:
         BASE_IMAGE: ruby:2.7
     volumes:
       - .:/app
-    entrypoint: bundle exec rspec
-  # # Fails, please fix
-  # rspec-3.0:
-  #   build:
-  #     context: .
-  #     args:
-  #       BASE_IMAGE: ruby:3.0
-  #   volumes:
-  #     - .:/app
-  #   entrypoint: bundle exec rspec
+  rspec-3.0:
+    build:
+      context: .
+      args:
+        BASE_IMAGE: ruby:3.0
+    volumes:
+      - .:/app

data/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+bundle install
+bundle exec rake spec

data/k8s-ruby.gemspec

@@ -1,5 +1,5 @@
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "k8s/ruby/version"
 
@@ -15,22 +15,23 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "bin"
   spec.executables   = []
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = [">= 2.4", "< 3.1"]
 
   spec.add_runtime_dependency "excon", "~> 0.71"
-  spec.add_runtime_dependency "dry-struct", "~> 0.5.0"
-  spec.add_runtime_dependency "dry-types", "~> 0.13.0"
-  spec.add_runtime_dependency "recursive-open-struct", "~> 1.1.0"
-  spec.add_runtime_dependency 'hashdiff', '~> 1.0.0'
-  spec.add_runtime_dependency 'jsonpath', '~> 0.9.5'
-  spec.add_runtime_dependency 'yajl-ruby', '~> 1.4.0'
-  spec.add_runtime_dependency "yaml-safe_load_stream", "~> 0.1"
+  spec.add_runtime_dependency "dry-struct", "<= 1.6.0"
+  spec.add_runtime_dependency "dry-types", "<= 1.7.0"
+  spec.add_runtime_dependency "dry-configurable", "~> 0.13.0"
+  spec.add_runtime_dependency "recursive-open-struct", "~> 1.1.3"
+  spec.add_runtime_dependency "hashdiff", "~> 1.0.0"
+  spec.add_runtime_dependency "jsonpath", "~> 0.9.5"
+  spec.add_runtime_dependency "yajl-ruby", "~> 1.4.0"
+  spec.add_runtime_dependency "yaml-safe_load_stream2", "~> 0.1.1"
 
   spec.add_development_dependency "bundler", ">= 1.17", "< 3.0"
   spec.add_development_dependency "rake", ">= 12.3.3"

data/lib/k8s/api/metav1/api_resource.rb

@@ -12,8 +12,8 @@ module K8s
         attribute :version, Types::Strict::String.optional.default(nil)
         attribute :kind, Types::Strict::String
         attribute :verbs, Types::Strict::Array.of(Types::Strict::String)
-        attribute :shortNames, Types::Strict::Array.of(Types::Strict::String).optional.default(proc { [] })
-        attribute :categories, Types::Strict::Array.of(Types::Strict::String).optional.default(proc { [] })
+        attribute :shortNames, Types::Strict::Array.of(Types::Strict::String).optional.default(proc { [] }, shared: true)
+        attribute :categories, Types::Strict::Array.of(Types::Strict::String).optional.default(proc { [] }, shared: true)
       end
 
       # @see https://godoc.org/k8s.io/apimachinery/pkg/apis/meta/v1#APIResourceList

data/lib/k8s/api/metav1/object.rb

@@ -38,9 +38,9 @@ module K8s
         attribute :deletionGracePeriodSeconds, Types::Strict::Integer.optional.default(nil)
         attribute :labels, Types::Strict::Hash.map(Types::Strict::String, Types::Strict::String).optional.default(nil)
         attribute :annotations, Types::Strict::Hash.map(Types::Strict::String, Types::Strict::String).optional.default(nil)
-        attribute :ownerReferences, Types::Strict::Array.of(OwnerReference).optional.default([])
+        attribute :ownerReferences, Types::Strict::Array.of(OwnerReference).optional.default([], shared: true)
         attribute :initializers, Initializers.optional.default(nil)
-        attribute :finalizers, Types::Strict::Array.of(Types::Strict::String).optional.default([])
+        attribute :finalizers, Types::Strict::Array.of(Types::Strict::String).optional.default([], shared: true)
         attribute :clusterName, Types::Strict::String.optional.default(nil)
       end
 

data/lib/k8s/api.rb

@@ -8,7 +8,7 @@ module K8s
   module API
     # Common Dry::Types used in the API
     module Types
-      include Dry::Types.module
+      include Dry::Types()
     end
 
     # Common API struct type, handling JSON transforms with symbol keys

data/lib/k8s/config.rb

@@ -25,7 +25,7 @@ module K8s
   class Config < ConfigStruct
     # Common dry-types for config
     class Types
-      include Dry::Types.module
+      include Dry::Types()
     end
 
     # structured cluster
@@ -99,12 +99,12 @@ module K8s
 
     attribute :kind, Types::Strict::String.optional.default(nil)
     attribute :apiVersion, Types::Strict::String.optional.default(nil)
-    attribute :preferences, Types::Strict::Hash.optional.default(proc { {} })
-    attribute :clusters, Types::Strict::Array.of(NamedCluster).optional.default(proc { [] })
-    attribute :users, Types::Strict::Array.of(NamedUser).optional.default(proc { [] })
-    attribute :contexts, Types::Strict::Array.of(NamedContext).optional.default(proc { [] })
+    attribute :preferences, Types::Strict::Hash.optional.default(proc { {} }, shared: true)
+    attribute :clusters, Types::Strict::Array.of(NamedCluster).optional.default(proc { [] }, shared: true)
+    attribute :users, Types::Strict::Array.of(NamedUser).optional.default(proc { [] }, shared: true)
+    attribute :contexts, Types::Strict::Array.of(NamedContext).optional.default(proc { [] }, shared: true)
     attribute :current_context, Types::Strict::String.optional.default(nil)
-    attribute :extensions, Types::Strict::Array.optional.default(proc { [] })
+    attribute :extensions, Types::Strict::Array.optional.default(proc { [] }, shared: true)
 
     # Loads a configuration from a YAML file
     #

data/lib/k8s/resource.rb

@@ -40,19 +40,16 @@ module K8s
     end
 
     # @param hash [Hash]
-    # @param recurse_over_arrays [Boolean]
     # @param options [Hash] see RecursiveOpenStruct#initialize
-    def initialize(hash, recurse_over_arrays: true, **options)
-      super(hash,
-        recurse_over_arrays: recurse_over_arrays,
-        **options
-      )
+    def initialize(hash, options = {})
+      options_with_defaults = { recurse_over_arrays: true }.merge(options)
+      super(hash, options_with_defaults)
     end
 
-    # @param options [Hash] see Hash#to_json
+    # @param args [Array] see Hash#to_json
     # @return [String]
-    def to_json(**options)
-      to_hash.to_json(**options)
+    def to_json(*args, **options)
+      to_hash.to_json(*args, **options)
     end
 
     # @param other [K8s::Resource]

data/lib/k8s/ruby/version.rb

@@ -3,6 +3,6 @@
 module K8s
   class Ruby
     # Updated on releases using semver.
-    VERSION = "0.11.0"
+    VERSION = "0.13.0"
   end
 end

data/lib/k8s/transport.rb

@@ -370,11 +370,8 @@ module K8s
     # @param options [Hash] @see #request
     # @return [Array<response_class, Hash, NilClass>]
     def get(*path, **options)
-      request(
-        method: 'GET',
-        path: self.path(*path),
-        **options
-      )
+      options = options.merge({ method: 'GET', path: self.path(*path) })
+      request(**options)
     end
 
     # @param paths [Array<String>]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: k8s-ruby
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - rdx.net
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -29,18 +29,32 @@ dependencies:
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -110,19 +124,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: yaml-safe_load_stream
+  name: yaml-safe_load_stream2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,16 +234,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.relaxed.yml"
 - ".rubocop.yml"
 - Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - docker-compose.yaml
+- entrypoint.sh
 - k8s-ruby.gemspec
 - lib/k8s-ruby.rb
 - lib/k8s/api.rb
@@ -265,13 +282,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Kubernetes client library for Ruby