kitchen-oci 1.10.0 → 1.10.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2 -0
- data/lib/kitchen/driver/oci.rb +12 -2
- data/lib/kitchen/driver/oci_version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 24dc904e175ae8c5b47cf6e56a80b00ed15e660976424a33e01ba761e8b4cecb
|
4
|
+
data.tar.gz: e68ef6e422b47a0a499fc06fa7e997670173cd5f05f163d70f84112461600852
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0611b9add40f1aea75264ef71b704c9233610d83859f1b4b3b530979c741c2745d89d2d3bbe5019f4739135e5cd5f09961b0d88152bdb5bfeb236835ea9748ed
|
7
|
+
data.tar.gz: 6d1bff4162e72b4b135dcd5b8a6f3e4b8857016dc1bf5fe3c3f5abddc5edbf12ab81be064b273532e35a859ff3ba08dea7dd5cbd5f839686677dfc66b1a8cae9
|
data/CHANGELOG.md
CHANGED
data/lib/kitchen/driver/oci.rb
CHANGED
@@ -223,7 +223,7 @@ module Kitchen
|
|
223
223
|
[prefix, random_hostname(instance.name)].compact.join('-')
|
224
224
|
elsif instance_type == 'dbaas'
|
225
225
|
# 30 character limit for hostname in DBaaS
|
226
|
-
if prefix.length
|
226
|
+
if prefix.length >= 30
|
227
227
|
[prefix[0, 26], 'db1'].compact.join('-')
|
228
228
|
else
|
229
229
|
[prefix, random_string(25 - prefix.length), 'db1'].compact.join('-')
|
@@ -423,7 +423,7 @@ module Kitchen
|
|
423
423
|
l.hostname = generate_hostname
|
424
424
|
l.shape = config[:shape]
|
425
425
|
l.ssh_public_keys = pubkey
|
426
|
-
l.cluster_name =
|
426
|
+
l.cluster_name = generate_cluster_name
|
427
427
|
l.initial_data_storage_size_in_gb = initial_data_storage_size_in_gb
|
428
428
|
l.node_count = 1
|
429
429
|
l.license_model = license_model
|
@@ -466,6 +466,16 @@ module Kitchen
|
|
466
466
|
end
|
467
467
|
end
|
468
468
|
|
469
|
+
def generate_cluster_name
|
470
|
+
prefix = config[:hostname_prefix].split('-')[0]
|
471
|
+
# 11 character limit for cluster_name in DBaaS
|
472
|
+
if prefix.length >= 11
|
473
|
+
prefix[0, 11]
|
474
|
+
else
|
475
|
+
[prefix, random_string(10 - prefix.length)].compact.join('-')
|
476
|
+
end
|
477
|
+
end
|
478
|
+
|
469
479
|
def dbaas_node(instance_id)
|
470
480
|
dbaas_api.list_db_nodes(
|
471
481
|
config[:compartment_id],
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kitchen-oci
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.10.
|
4
|
+
version: 1.10.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stephen Pearson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-02-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: oci
|
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
147
147
|
- !ruby/object:Gem::Version
|
148
148
|
version: '0'
|
149
149
|
requirements: []
|
150
|
-
rubygems_version: 3.0.
|
150
|
+
rubygems_version: 3.0.1
|
151
151
|
signing_key:
|
152
152
|
specification_version: 4
|
153
153
|
summary: A Test Kitchen Driver for Oracle OCI
|