kitchen-oci 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d798253a77bea857de7ca9f24c6ce5943b9521231cf737bd8a35328cce90e42a
-  data.tar.gz: 5aedb2971a35efe057733e24df84c0f59296cc934871d6b4d2cbb57bfa510d7c
+  metadata.gz: 24dc904e175ae8c5b47cf6e56a80b00ed15e660976424a33e01ba761e8b4cecb
+  data.tar.gz: e68ef6e422b47a0a499fc06fa7e997670173cd5f05f163d70f84112461600852
 SHA512:
-  metadata.gz: ee1e27d4ee19ff91240b2bb3c236b87bdf13081af36e3b1e06decad31b9f998642df41612f949542d70e3add8b6fcef2442e8bbdc81afd0b7a72f03651dab669
-  data.tar.gz: b70069f530ae95ffdacefb0113b00fb2eb6ee04da8f5814ce6c15af0556062e26bd0ffdba19dd7c4281f892a173ac118be237620c8d77749b0e7989693284380
+  metadata.gz: 0611b9add40f1aea75264ef71b704c9233610d83859f1b4b3b530979c741c2745d89d2d3bbe5019f4739135e5cd5f09961b0d88152bdb5bfeb236835ea9748ed
+  data.tar.gz: 6d1bff4162e72b4b135dcd5b8a6f3e4b8857016dc1bf5fe3c3f5abddc5edbf12ab81be064b273532e35a859ff3ba08dea7dd5cbd5f839686677dfc66b1a8cae9

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.10.1 Issue 22
+- Added safeguard for cluster_name length restriction in DBaaS.
 
 ## 1.10.0 DBaaS support
 - Added support for DBaaS.

data/lib/kitchen/driver/oci.rb

@@ -223,7 +223,7 @@ module Kitchen
           [prefix, random_hostname(instance.name)].compact.join('-')
         elsif instance_type == 'dbaas'
           # 30 character limit for hostname in DBaaS
-          if prefix.length > 30
+          if prefix.length >= 30
             [prefix[0, 26], 'db1'].compact.join('-')
           else
             [prefix, random_string(25 - prefix.length), 'db1'].compact.join('-')
@@ -423,7 +423,7 @@ module Kitchen
           l.hostname = generate_hostname
           l.shape = config[:shape]
           l.ssh_public_keys = pubkey
-          l.cluster_name = [config[:hostname_prefix].split('-')[0], random_string(3), random_number(2)].compact.join('-')
+          l.cluster_name = generate_cluster_name
           l.initial_data_storage_size_in_gb = initial_data_storage_size_in_gb
           l.node_count = 1
           l.license_model = license_model
@@ -466,6 +466,16 @@ module Kitchen
         end
       end
 
+      def generate_cluster_name
+        prefix = config[:hostname_prefix].split('-')[0]
+        # 11 character limit for cluster_name in DBaaS
+        if prefix.length >= 11
+          prefix[0, 11]
+        else
+          [prefix, random_string(10 - prefix.length)].compact.join('-')
+        end
+      end
+
       def dbaas_node(instance_id)
         dbaas_api.list_db_nodes(
           config[:compartment_id],

data/lib/kitchen/driver/oci_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Driver
     # Version string for Oracle OCI Kitchen driver
-    OCI_VERSION = '1.10.0'
+    OCI_VERSION = '1.10.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Stephen Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Oracle OCI