kitchen-oci 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac8fb8a6a0caaf9b86de1a6178009101fa642e4c6912acb6774fde2f664ae26
-  data.tar.gz: 4a635fbcff0cec7a548709f65e780fe24628733b61441f6feafdf9e988900166
+  metadata.gz: d798253a77bea857de7ca9f24c6ce5943b9521231cf737bd8a35328cce90e42a
+  data.tar.gz: 5aedb2971a35efe057733e24df84c0f59296cc934871d6b4d2cbb57bfa510d7c
 SHA512:
-  metadata.gz: 96e29112bec4d1f0dad5fbbe46e9accf959b27c63b6ca86e81bb32f9e89e7f646aaf720b7185072f9d9c04f45681172d0e6f5bfd14b212fbeee4e87cd9f6cc3f
-  data.tar.gz: cc7f3a9dce9e3b7470ba8480551baa908e0b3880e5a17bfbceec0b0cdea9f2c6c7d9191438b4dbd0248416954d2bd26021748b9148be1c055c477b60448a5dcc
+  metadata.gz: ee1e27d4ee19ff91240b2bb3c236b87bdf13081af36e3b1e06decad31b9f998642df41612f949542d70e3add8b6fcef2442e8bbdc81afd0b7a72f03651dab669
+  data.tar.gz: b70069f530ae95ffdacefb0113b00fb2eb6ee04da8f5814ce6c15af0556062e26bd0ffdba19dd7c4281f892a173ac118be237620c8d77749b0e7989693284380

data/.rubocop.yml

@@ -0,0 +1,5 @@
+Layout/LineLength:
+    Max : 150
+
+Style/NumericLiterals:
+    Enabled : false

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+## 1.10.0 DBaaS support
+- Added support for DBaaS.
+  - instance_type is new optional parameter (compute or dbaas)
+
+## 1.9.0 Use instance principals
+- Added support for `use_instance_principals`
+
 ## 1.8.0 Freeform tags
 - Added optional parameter `freeform_tags`
 
@@ -10,4 +17,3 @@
 - Added cloud-init support.
 - Added support for Windows targets.
   - Can inject powershell script to set a random password and enable WinRM
-

data/README.md

@@ -51,79 +51,100 @@ gem install pkg/kitchen-oci-<VERSION>.gem
 
 ## Example .kitchen.yml
 
-Adjust below template as required.  The following configuration is mandatory:
+Adjust below template as required.  The following configuration is mandatory for all instance types:
 
-   - compartment\_id
-   - availability\_domain
-   - image\_id
-   - shape
-   - subnet\_id
+   - `compartment_id`
+   - `availability_domain`
+   - `shape`
+   - `subnet_id`
+
+There is an additional configuration item that allows for toggling instance types.  If this item is not included, it defaults to `compute`.
+
+   - Permitted values of `instance_type`:
+      - compute
+      - dbaas
 
 Note: The availability domain should be the full AD name including the tenancy specific prefix.  For example: "AaBb:US-ASHBURN-AD-1".  Look in the OCI console to get your tenancy specific string.
 
+### Compute Instance Type
+
+The following configuration is mandatory:
+
+   - `image_id`
+
 These settings are optional:
 
-   - use\_private\_ip, Whether to connect to the instance using a private IP, default is false (public ip)
-   - oci\_config\_file, OCI configuration file, by default this is ~/.oci/config
-   - oci\_profile\_name, OCI profile to use, default value is "DEFAULT"
-   - ssh\_keypath, SSH public key, default is ~/.ssh/id\_rsa.pub
-   - post\_create\_script, run a script on compute\_instance after deployment
-   - proxy\_url, Connect via the specified proxy URL
-   - user\_data, Add user data scripts
-   - hostname\_prefix, Prefix for the generated hostnames (note that OCI doesn't like underscores)
-   - freeform\_tags, Hash containing tag name(s) and values(s)
-   - use\_instance\_principals, Boolean flag indicated whether Instance Principals should be used as credentials (see below)
+   - `use_private_ip`, Whether to connect to the instance using a private IP, default is false (public ip)
+   - `oci_config_file`, OCI configuration file, by default this is ~/.oci/config
+   - `oci_profile_name`, OCI profile to use, default value is "DEFAULT"
+   - `ssh_keypath`, SSH public key, default is ~/.ssh/id\_rsa.pub
+   - `post_create_script`, run a script on compute\_instance after deployment
+   - `proxy_url`, Connect via the specified proxy URL
+   - `user_data`, Add user data scripts
+   - `hostname_prefix`, Prefix for the generated hostnames (note that OCI doesn't like underscores)
+   - `freeform_tags`, Hash containing tag name(s) and values(s)
+   - `use_instance_principals`, Boolean flag indicated whether Instance Principals should be used as credentials (see below)
 
 Optional settings for WinRM support in Windows:
 
-   - setup\_winrm, Inject Windows powershell to set password and enable WinRM, default false.
-   - winrm\_username, Used to set the WinRM transport username, defaults to 'opc'.
-   - winrm\_password, Set the winrm password.  By default a randomly generated password will be used, so don't set this unless you have to.  Beware that the password must meet the Windows password complexity requirements otherwise the bootstrapping procedure will fail silently and Kitchen will eventually time out.
+   - `setup_winrm`, Inject Windows powershell to set password and enable WinRM, default false.
+   - `winrm_username`, Used to set the WinRM transport username, defaults to 'opc'.
+   - `winrm_password`, Set the winrm password.  By default a randomly generated password will be used, so don't set this unless you have to.  Beware that the password must meet the Windows password complexity requirements otherwise the bootstrapping procedure will fail silently and Kitchen will eventually time out.
 
-The use\_private\_ip influences whether the public or private IP will be used by Kitchen to connect to the instance.  If it is set to false (the default) then it will connect to the public IP, otherwise it'll use the private IP.
+The `use_private_ip` influences whether the public or private IP will be used by Kitchen to connect to the instance.  If it is set to false (the default) then it will connect to the public IP, otherwise it'll use the private IP.
 
-If the subnet\_id refers to a subnet configured to disallow public IPs on any attached VNICs, then the VNIC will be created without a public IP and the use\_private\_ip flag will assumed to be true irrespective of the config setting.  On subnets that do allow a public IP a public IP will be allocated to the VNIC, but the use\_private\_ip flag can still be used to override whether the private or public IP will be used.
+If the `subnet_id` refers to a subnet configured to disallow public IPs on any attached VNICs, then the VNIC will be created without a public IP and the `use_private_ip` flag will assumed to be true irrespective of the config setting.  On subnets that do allow a public IP a public IP will be allocated to the VNIC, but the `use_private_ip` flag can still be used to override whether the private or public IP will be used.
 
 ```yml
 ---
-driver:
-  name: oci
+  driver:
+    name: oci
+    # These are mandatory
+    compartment_id: "ocid1.compartment.oc1..xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    availability_domain: "XyAb:US-ASHBURN-AD-1"
+    image_id: "ocid1.image.oc1.phx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    shape: "VM.Standard1.2"
+    subnet_id: "ocid1.subnet.oc1.phx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+    # These are optional
+    use_private_ip: false
+    oci_config_file: "~/.oci/config"
+    oci_profile_name: "DEFAULT"
+    ssh_keypath: "~/.ssh/id_rsa.pub"
+    post_create_script: >-
+```
 
-provisioner:
-  name: chef_zero
-  always_update_cookbooks: true
+### DBaaS Instance Type
 
-verifier:
-  name: inspec
+The DBaaS instance type configuration should be written in a hash beginning with `dbaas`.
 
-platforms:
-  - name: ubuntu-18.04
-    driver:
-      # These are mandatory
-      compartment_id: "ocid1.compartment.oc1..xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-      availability_domain: "XyAb:US-ASHBURN-AD-1"
-      image_id: "ocid1.image.oc1.phx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-      shape: "VM.Standard1.2"
-      subnet_id: "ocid1.subnet.oc1.phx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+The following configuration item is mandatory for the DBaaS `instance_type`:
 
-      # These are optional
-      use_private_ip: false
-      oci_config_file: "~/.oci/config"
-      oci_profile_name: "DEFAULT"
-      ssh_keypath: "~/.ssh/id_rsa.pub"
-      post_create_script: >-
-        touch /tmp/example.txt;
-    transport:
-      username: "ubuntu"
+   - `db_version`, The specific version of the Oracle database software to be installed. Values can be at either the major version level (eg. 12.1.0.2) or at a PSU level (eg. 12.1.0.2.191015). If no PSU is provided, the latest available will be installed.
 
-suites:
-  - name: default
-    run_list:
-      - recipe[my_cookbook::default]
-    verifier:
-      inspec_tests:
-        - test/smoke/default
-    attributes:
+The following is a list of optional items for the DBaaS `instance_type`:
+
+   - `cpu_core_count`, CPU core count for DBaaS nodes.  Default value is 2
+   - `database_edition`, The edition of the Oracle database software to be installed.  Default value is ENTERPRISE_EDITION
+   - `license_model`, The licensing model for the Oracle database software.  Default value is BRING_YOUR_OWN_LICENSE
+   - `db_name`, The name of the database to be provisioned.  Must be 8 characters or less, alphanumeric.  Default value is `dbaas1`.
+   - `pdb_name`, The name of the pdb to be provisioned.  Only valid if `db_version` is 12cR1 or higher.  Default value is nil (OCI will create a single pdb with the name `db_name`\_PDB1)
+   - `admin_password`, The SYS password of the database to be provisioned.  Password must be 9 to 30 characters and contain at least 2 uppercase, 2 lowercase, 2 special, and 2 numeric characters. The special characters must be `_`, `#`, or `-`.  Default value will be a randomly generated password
+   - `initial_data_storage_size_in_gb`, The desired amount of database storage in GB.  Default value is 256
+   - `character_set`, The characterset of the database.  Default value is AL32UTF8
+   - `ncharacter_set`, The national characterset of the database.  Default value is AL16UTF16
+   - `db_workload`, The desired workload configuration for the database.  Acceptable values are 'OLTP' and 'DSS'.  Default value is 'OLTP'
+
+Note: At this time, `node_count` is forced to be 1.  RAC provisioning is not supported.
+
+```yml
+---
+  driver:
+    name: oci
+    instance_type: dbaas
+    ...
+    dbaas:
+      db_version: "12.1.0.2.191015"
 ```
 
 ## Instance Principals
@@ -152,15 +173,15 @@ This will allow the OCI lib to retrieve the certificate, key and ca-chain from t
 The driver has support for adding user data that can be executed as scripts by cloud-init.  These can either be specified inline or by referencing a file.  Examples:
 
 ```yml
-      user_data:
-        - type: x-shellscript
-          inline: |
-            #!/bin/bash
-            touch /tmp/foo.txt
-          filename: init.sh
-        - type: x-shellscript
-          path: myscript.sh
-          filename: myscript.sh
+  user_data:
+    - type: x-shellscript
+      inline: |
+        #!/bin/bash
+        touch /tmp/foo.txt
+      filename: init.sh
+    - type: x-shellscript
+      path: myscript.sh
+      filename: myscript.sh
 ```
 
 The `filename` parameter must be specified for each entry, and determines the destination filename for the script.  If the user data is to be read from a file then the `path` parameter should be specified to indicate where the file is to be read from.
@@ -198,7 +219,7 @@ See also the section above on Instance Principals if you plan to use a proxy in
 
 ## Windows Support
 
-When launching Oracle provided Windows images, it may be helpful to allow Kitchen-oci to inject powershell to configure WinRM and to set a randomized password that does not need to be changed on first login.  If the `setup_winrm` parameter is set to true then the following steps will happen:
+When launching Oracle provided Windows images, it may be helpful to allow kitchen-oci to inject powershell to configure WinRM and to set a randomized password that does not need to be changed on first login.  If the `setup_winrm` parameter is set to true then the following steps will happen:
 
   - A random password will be generated and stored into the Kitchen state
   - A powershell script will be generated which sets the password for whatever username is defined in the transport section.

data/lib/kitchen/driver/oci.rb

@@ -21,7 +21,6 @@
 
 # This require fixes bug in ChefDK 4.0.60-1 on Linux.
 require 'forwardable'
-
 require 'base64'
 require 'erb'
 require 'kitchen'
@@ -35,15 +34,14 @@ module Kitchen
     #
     # @author Stephen Pearson <stephen.pearson@oracle.com>
     class Oci < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength
+      # required config items
       required_config :compartment_id
       required_config :availability_domain
-      required_config :image_id
       required_config :shape
       required_config :subnet_id
 
-      default_config :use_private_ip, false
-      default_config :oci_config_file, nil
-      default_config :oci_profile_name, nil
+      # common config items
+      default_config :instance_type, 'compute'
       default_config :hostname_prefix, nil
       default_keypath = File.expand_path(File.join(%w[~ .ssh id_rsa.pub]))
       default_config :ssh_keypath, default_keypath
@@ -51,32 +49,19 @@ module Kitchen
       default_config :proxy_url, nil
       default_config :user_data, []
       default_config :freeform_tags, {}
+
+      # compute config items
+      default_config :image_id
+      default_config :use_private_ip, false
+      default_config :oci_config_file, nil
+      default_config :oci_profile_name, nil
       default_config :setup_winrm, false
       default_config :winrm_user, 'opc'
       default_config :winrm_password, nil
       default_config :use_instance_principals, false
 
-      def process_freeform_tags(freeform_tags)
-        prov = instance.provisioner.instance_variable_get(:@config)
-        tags = %w[run_list policyfile]
-        tags.each do |tag|
-          unless prov[tag.to_sym].nil? || prov[tag.to_sym].empty?
-            freeform_tags[tag] = prov[tag.to_sym].join(',')
-          end
-        end
-        freeform_tags[:kitchen] = true
-        freeform_tags
-      end
-
-      def process_windows_options(state)
-        state[:username] = config[:winrm_user] if config[:setup_winrm]
-        if config[:setup_winrm] == true &&
-           config[:password].nil? &&
-           state[:password].nil?
-          state[:password] = config[:winrm_password] || random_password
-        end
-        state
-      end
+      # dbaas config items
+      default_config :dbaas, {}
 
       def create(state)
         return if state[:server_id]
@@ -84,6 +69,7 @@ module Kitchen
         state = process_windows_options(state)
 
         instance_id = launch_instance(state)
+
         state[:server_id] = instance_id
         state[:hostname] = instance_ip(instance_id)
 
@@ -100,23 +86,53 @@ module Kitchen
         return unless state[:server_id]
 
         instance.transport.connection(state).close
-        comp_api.terminate_instance(state[:server_id])
+
+        if instance_type == 'compute'
+          comp_api.terminate_instance(state[:server_id])
+        elsif instance_type == 'dbaas'
+          dbaas_api.terminate_db_system(state[:server_id])
+        end
 
         state.delete(:server_id)
         state.delete(:hostname)
       end
 
+      def process_freeform_tags(freeform_tags)
+        prov = instance.provisioner.instance_variable_get(:@config)
+        tags = %w[run_list policyfile]
+        tags.each do |tag|
+          freeform_tags[tag] = prov[tag.to_sym].join(',') unless prov[tag.to_sym].nil? || prov[tag.to_sym].empty?
+        end
+        freeform_tags[:kitchen] = true
+        freeform_tags
+      end
+
+      def process_windows_options(state)
+        state[:username] = config[:winrm_user] if config[:setup_winrm]
+        if config[:setup_winrm] == true &&
+           config[:password].nil? &&
+           state[:password].nil?
+          state[:password] = config[:winrm_password] || random_password
+        end
+        state
+      end
+
       private
 
+      def instance_type
+        raise 'instance_type must be either compute or dbaas!' unless %w[compute dbaas].include?(config[:instance_type].downcase)
+
+        config[:instance_type].downcase
+      end
+
+      ####################
+      # OCI config setup #
+      ####################
       def oci_config
         params = [:load_config]
         opts = {}
-        if config[:oci_config_file]
-          opts[:config_file_location] = config[:oci_config_file]
-        end
-        if config[:oci_profile_name]
-          opts[:profile_name] = config[:oci_profile_name]
-        end
+        opts[:config_file_location] = config[:oci_config_file] if config[:oci_config_file]
+        opts[:profile_name] = config[:oci_profile_name] if config[:oci_profile_name]
         params << opts
         OCI::ConfigFileLoader.send(*params)
       end
@@ -141,6 +157,9 @@ module Kitchen
         end
       end
 
+      #############
+      # API setup #
+      #############
       def generic_api(klass)
         api_prx = api_proxy
         if config[:use_instance_principals]
@@ -161,11 +180,90 @@ module Kitchen
         generic_api(OCI::Core::VirtualNetworkClient)
       end
 
+      def dbaas_api
+        generic_api(OCI::Database::DatabaseClient)
+      end
+
+      ##################
+      # Common methods #
+      ##################
       def launch_instance(state)
-        request = compute_instance_request(state)
+        if instance_type == 'compute'
+          launch_compute_instance(state)
+        elsif instance_type == 'dbaas'
+          launch_dbaas_instance
+        end
+      end
+
+      def public_ip_allowed?
+        subnet = net_api.get_subnet(config[:subnet_id]).data
+        !subnet.prohibit_public_ip_on_vnic
+      end
+
+      def instance_ip(instance_id)
+        if instance_type == 'compute'
+          compute_instance_ip(instance_id)
+        elsif instance_type == 'dbaas'
+          dbaas_instance_ip(instance_id)
+        end
+      end
+
+      def pubkey
+        if instance_type == 'compute'
+          File.readlines(config[:ssh_keypath]).first.chomp
+        elsif instance_type == 'dbaas'
+          result = []
+          result << File.readlines(config[:ssh_keypath]).first.chomp
+        end
+      end
+
+      def generate_hostname
+        prefix = config[:hostname_prefix]
+        if instance_type == 'compute'
+          [prefix, random_hostname(instance.name)].compact.join('-')
+        elsif instance_type == 'dbaas'
+          # 30 character limit for hostname in DBaaS
+          if prefix.length > 30
+            [prefix[0, 26], 'db1'].compact.join('-')
+          else
+            [prefix, random_string(25 - prefix.length), 'db1'].compact.join('-')
+          end
+        end
+      end
+
+      def random_hostname(prefix)
+        "#{prefix}-#{random_string(6)}"
+      end
+
+      def random_password
+        if instance_type == 'compute'
+          special_chars = %w[! " # & ( ) * + , - . /]
+        elsif instance_type == 'dbaas'
+          special_chars = %w[# _ -]
+        end
 
+        (Array.new(5) { special_chars.sample } +
+         Array.new(5) { ('a'..'z').to_a.sample } +
+         Array.new(5) { ('A'..'Z').to_a.sample } +
+         Array.new(5) { ('0'..'9').to_a.sample }).shuffle.join
+      end
+
+      def random_string(length)
+        Array.new(length) { ('a'..'z').to_a.sample }.join
+      end
+
+      def random_number(length)
+        Array.new(length) { ('0'..'9').to_a.sample }.join
+      end
+
+      ###################
+      # Compute methods #
+      ###################
+      def launch_compute_instance(state)
+        request = compute_instance_request(state)
         response = comp_api.launch_instance(request)
         instance_id = response.data.id
+
         comp_api.get_instance(instance_id).wait_until(
           :lifecycle_state,
           OCI::Core::Models::Instance::LIFECYCLE_STATE_RUNNING
@@ -173,36 +271,32 @@ module Kitchen
         instance_id
       end
 
-      def vnic_attachments(instance_id)
-        att = comp_api.list_vnic_attachments(
-          config[:compartment_id],
-          instance_id: instance_id
-        ).data
-
-        raise 'Could not find any VNIC attachments' unless att.any?
+      def compute_instance_request(state)
+        request = compute_launch_details
 
-        att
-      end
+        inject_powershell(state) if config[:setup_winrm] == true
 
-      def vnics(instance_id)
-        vnic_attachments(instance_id).map do |att|
-          net_api.get_vnic(att.vnic_id).data
-        end
+        metadata = {}
+        metadata.store('ssh_authorized_keys', pubkey)
+        data = user_data
+        metadata.store('user_data', data) if config[:user_data].any?
+        request.metadata = metadata
+        request
       end
 
-      def instance_ip(instance_id)
-        vnic = vnics(instance_id).select(&:is_primary).first
-        if public_ip_allowed?
-          config[:use_private_ip] ? vnic.private_ip : vnic.public_ip
-        else
-          vnic.private_ip
+      def compute_launch_details
+        OCI::Core::Models::LaunchInstanceDetails.new.tap do |l|
+          hostname = generate_hostname
+          l.availability_domain = config[:availability_domain]
+          l.compartment_id = config[:compartment_id]
+          l.display_name = hostname
+          l.source_details = instance_source_details
+          l.shape = config[:shape]
+          l.create_vnic_details = create_vnic_details(hostname)
+          l.freeform_tags = process_freeform_tags(config[:freeform_tags])
         end
       end
 
-      def pubkey
-        File.readlines(config[:ssh_keypath]).first.chomp
-      end
-
       def instance_source_details
         OCI::Core::Models::InstanceSourceViaImageDetails.new(
           sourceType: 'image',
@@ -210,11 +304,6 @@ module Kitchen
         )
       end
 
-      def public_ip_allowed?
-        subnet = net_api.get_subnet(config[:subnet_id]).data
-        !subnet.prohibit_public_ip_on_vnic
-      end
-
       def create_vnic_details(name)
         OCI::Core::Models::CreateVnicDetails.new(
           assign_public_ip: public_ip_allowed?,
@@ -224,12 +313,48 @@ module Kitchen
         )
       end
 
+      def vnics(instance_id)
+        vnic_attachments(instance_id).map do |att|
+          net_api.get_vnic(att.vnic_id).data
+        end
+      end
+
+      def vnic_attachments(instance_id)
+        att = comp_api.list_vnic_attachments(
+          config[:compartment_id],
+          instance_id: instance_id
+        ).data
+
+        raise 'Could not find any VNIC attachments' unless att.any?
+
+        att
+      end
+
+      def compute_instance_ip(instance_id)
+        vnic = vnics(instance_id).select(&:is_primary).first
+        if public_ip_allowed?
+          config[:use_private_ip] ? vnic.private_ip : vnic.public_ip
+        else
+          vnic.private_ip
+        end
+      end
+
       def winrm_ps1(state)
         filename = File.join(__dir__, %w[.. .. .. tpl setup_winrm.ps1.erb])
         tpl = ERB.new(File.read(filename))
         tpl.result(binding)
       end
 
+      def inject_powershell(state)
+        data = winrm_ps1(state)
+        config[:user_data] ||= []
+        config[:user_data] << {
+          type: 'x-shellscript',
+          inline: data,
+          filename: 'setup_winrm.ps1'
+        }
+      end
+
       def read_part(part)
         if part[:path]
           content = File.read part[:path]
@@ -265,60 +390,100 @@ module Kitchen
         Base64.encode64(gzip.close.string).delete("\n")
       end
 
-      def inject_powershell(state)
-        data = winrm_ps1(state)
-        config[:user_data] ||= []
-        config[:user_data] << {
-          type: 'x-shellscript',
-          inline: data,
-          filename: 'setup_winrm.ps1'
-        }
-      end
+      #################
+      # DBaaS methods #
+      #################
+      def launch_dbaas_instance
+        request = dbaas_launch_details
+        response = dbaas_api.launch_db_system(request)
+        instance_id = response.data.id
 
-      def generate_hostname
-        prefix = config[:hostname_prefix]
-        [prefix, random_hostname(instance.name)].compact.join('-')
+        dbaas_api.get_db_system(instance_id).wait_until(
+          :lifecycle_state,
+          OCI::Database::Models::DbSystem::LIFECYCLE_STATE_AVAILABLE,
+          max_interval_seconds: 900,
+          max_wait_seconds: 21600
+        )
+        instance_id
       end
 
-      def base_oci_launch_details
-        OCI::Core::Models::LaunchInstanceDetails.new.tap do |l|
-          hostname = generate_hostname
+      def dbaas_launch_details # rubocop:disable Metrics/MethodLength
+        cpu_core_count = config[:dbaas][:cpu_core_count] ||= 2
+        database_edition = config[:dbaas][:database_edition] ||= OCI::Database::Models::DbSystem::DATABASE_EDITION_ENTERPRISE_EDITION
+        initial_data_storage_size_in_gb = config[:dbaas][:initial_data_storage_size_in_gb] ||= 256
+        license_model = config[:dbaas][:license_model] ||= OCI::Database::Models::DbSystem::LICENSE_MODEL_BRING_YOUR_OWN_LICENSE
+
+        OCI::Database::Models::LaunchDbSystemDetails.new.tap do |l|
           l.availability_domain = config[:availability_domain]
           l.compartment_id = config[:compartment_id]
-          l.display_name = hostname
-          l.source_details = instance_source_details
+          l.cpu_core_count = cpu_core_count
+          l.database_edition = database_edition
+          l.db_home = create_db_home_details
+          l.display_name = [config[:hostname_prefix], random_string(4), random_number(2)].compact.join('-')
+          l.hostname = generate_hostname
           l.shape = config[:shape]
-          l.create_vnic_details = create_vnic_details(hostname)
+          l.ssh_public_keys = pubkey
+          l.cluster_name = [config[:hostname_prefix].split('-')[0], random_string(3), random_number(2)].compact.join('-')
+          l.initial_data_storage_size_in_gb = initial_data_storage_size_in_gb
+          l.node_count = 1
+          l.license_model = license_model
+          l.subnet_id = config[:subnet_id]
           l.freeform_tags = process_freeform_tags(config[:freeform_tags])
         end
       end
 
-      def compute_instance_request(state)
-        request = base_oci_launch_details
+      def create_db_home_details
+        raise 'db_version cannot be nil!' if config[:dbaas][:db_version].nil?
 
-        inject_powershell(state) if config[:setup_winrm] == true
+        OCI::Database::Models::CreateDbHomeDetails.new.tap do |l|
+          l.database = create_database_details
+          l.db_version = config[:dbaas][:db_version]
+          l.display_name = ['dbhome', random_number(10)].compact.join('')
+        end
+      end
 
-        metadata = {}
-        metadata.store('ssh_authorized_keys', pubkey)
-        data = user_data
-        metadata.store('user_data', data) if config[:user_data].any?
-        request.metadata = metadata
-        request
+      def create_database_details # rubocop:disable Metrics/MethodLength
+        character_set = config[:dbaas][:character_set] ||= 'AL32UTF8'
+        ncharacter_set = config[:dbaas][:ncharacter_set] ||= 'AL16UTF16'
+        db_workload = config[:dbaas][:db_workload] ||= OCI::Database::Models::CreateDatabaseDetails::DB_WORKLOAD_OLTP
+        admin_password = config[:dbaas][:admin_password] ||= random_password
+        db_name = config[:dbaas][:db_name] ||= 'dbaas1'
+
+        OCI::Database::Models::CreateDatabaseDetails.new.tap do |l|
+          l.admin_password = admin_password
+          l.character_set = character_set
+          l.db_name = db_name
+          l.db_workload = db_workload
+          l.ncharacter_set = ncharacter_set
+          l.pdb_name = config[:dbaas][:pdb_name]
+          l.db_backup_config = db_backup_config
+        end
       end
 
-      def random_hostname(prefix)
-        "#{prefix}-#{random_string(6)}"
+      def db_backup_config
+        OCI::Database::Models::DbBackupConfig.new.tap do |l|
+          l.auto_backup_enabled = false
+        end
       end
 
-      def random_password
-        (Array.new(5) { %w[! " # & ( ) * + , - . /].sample } +
-         Array.new(5) { ('a'..'z').to_a.sample } +
-         Array.new(5) { ('A'..'Z').to_a.sample } +
-         Array.new(5) { ('0'..'9').to_a.sample }).shuffle.join
+      def dbaas_node(instance_id)
+        dbaas_api.list_db_nodes(
+          config[:compartment_id],
+          db_system_id: instance_id
+        ).data
       end
 
-      def random_string(length)
-        Array.new(length) { ('a'..'z').to_a.sample }.join
+      def dbaas_vnic(node_ocid)
+        dbaas_api.get_db_node(node_ocid).data
+      end
+
+      def dbaas_instance_ip(instance_id)
+        vnic = dbaas_node(instance_id).select(&:vnic_id).first.vnic_id
+        if public_ip_allowed?
+          net_api.get_vnic(vnic).data.public_ip
+        else
+          net_api.get_vnic(vnic).data.private_ip
+        end
       end
     end
   end

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.9.0'
+    OCI_VERSION = '1.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-oci
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Stephen Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oci
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".cane"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Oracle OCI