Merge pull request #1566 from oracle/release_gh

Releasing version v4.70.0

Author: rashik-bhasin

.goreleaser.yml

@@ -62,6 +62,6 @@ release:
   # If you want to manually examine the release before its live, uncomment this line:
   # draft: true
 changelog:
-  skip: true
+  skip: false
 
 project_name: terraform-provider-oci

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 4.70.0 (April 07, 2022)
+
+### Added
+- TF Samples for devops deployment service realated to B/G and Private Oke
+- Support for osp_gateway saas invoices
+- New APIs - GetRepoFileDiff and GetRepoFileLine
+- Compute List Shapes API returns number of network ports
+- Support for Marketplace Expansion
+- Support for KMS integration with VM
+- Support for JMS life cycle management
+- Support for private OKE environments and blue-green/canary stages
+- Support for BGP disable and BFD feature in Fastconnect service
+- Support for diagnostic reboot for compute VM instances
+- Alarms, Top Processes, zLinux support
+
+### Bug Fix
+- updating certificates in load balancer SSL configuration
+- Data Safe test failure and resource discovery fixes
+
 ## 4.69.0 (March 23, 2022)
 
 ### Added

examples/database/db_systems/db_vm/main.tf

@@ -15,6 +15,15 @@ variable "private_key_path" {
 variable "region" {
 }
 
+variable "kms_key_id" {
+}
+
+variable "kms_key_version_id" {
+}
+
+variable "vault_id" {
+}
+
 variable "compartment_ocid" {
 }
 
@@ -24,7 +33,7 @@ variable "ssh_public_key" {
 variable "ssh_private_key" {
 }
 
-# DBSystem specific 
+# DBSystem specific
 variable "db_system_shape" {
   default = "VM.Standard2.1"
 }
@@ -277,6 +286,9 @@ resource "oci_database_db_system" "test_db_system" {
   db_home {
     database {
       admin_password = var.db_admin_password
+      kms_key_version_id    = var.kms_key_version_id
+      kms_key_id     = var.kms_key_id
+      vault_id       = var.vault_id
       db_name        = "aTFdbVm"
       character_set  = var.character_set
       ncharacter_set = var.n_character_set

examples/devops/build.tf renamed to examples/devops/build_service/build.tf

@@ -0,0 +1,161 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "region" {
+}
+
+provider "oci" {
+  #version = "4.62.0"
+  region           = var.region
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+}
+
+resource "random_string" "topicname" {
+  length  = 10
+  special = false
+}
+
+resource "random_string" "projectname" {
+  length  = 10
+  special = false
+}
+
+resource "oci_ons_notification_topic" "test_notification_topic" {
+  #Required
+  compartment_id = var.compartment_ocid
+  name           = random_string.topicname.result
+}
+
+resource "oci_devops_project" "test_project" {
+  #Required
+  compartment_id = var.compartment_ocid
+  name = join("", [
+    "A",
+    random_string.projectname.result])
+  notification_config {
+    #Required
+    topic_id = oci_ons_notification_topic.test_notification_topic.id
+  }
+}
+
+resource "oci_devops_deploy_pipeline" "test_deploy_pipeline" {
+  #Required
+  project_id = oci_devops_project.test_project.id
+
+  description  = "description"
+  display_name = "testDeployPipeline"
+  deploy_pipeline_parameters {
+    items {
+      #Required
+      name = "test"
+      description = "test pipeline"
+    }
+  }
+}
+
+resource "oci_devops_deploy_artifact" "test_deploy_artifact" {
+  argument_substitution_mode = "SUBSTITUTE_PLACEHOLDERS"
+  deploy_artifact_type       = "DEPLOYMENT_SPEC"
+  project_id                 = oci_devops_project.test_project.id
+
+  deploy_artifact_source {
+    deploy_artifact_source_type = "INLINE"
+    base64encoded_content       = file("${path.module}/manifest/spec.yaml")
+  }
+}
+
+resource "oci_devops_deploy_environment" "test_deploy_instance_group_environment_a" {
+  compute_instance_group_selectors {
+    items {
+      compute_instance_ids = [oci_core_instance.example_instance_a.id]
+      selector_type = "INSTANCE_IDS"
+    }
+  }
+  deploy_environment_type = "COMPUTE_INSTANCE_GROUP"
+  project_id = oci_devops_project.test_project.id
+}
+
+resource "oci_devops_deploy_environment" "test_deploy_instance_group_environment_b" {
+  compute_instance_group_selectors {
+    items {
+      compute_instance_ids = [oci_core_instance.example_instance_b.id]
+      selector_type = "INSTANCE_IDS"
+    }
+  }
+  deploy_environment_type = "COMPUTE_INSTANCE_GROUP"
+  project_id = oci_devops_project.test_project.id
+}
+
+resource "oci_devops_deploy_stage" "test_blue_green_deploy_instance_group_stage" {
+  deploy_environment_id_a = oci_devops_deploy_environment.test_deploy_instance_group_environment_a.id
+  deploy_environment_id_b = oci_devops_deploy_environment.test_deploy_instance_group_environment_b.id
+  deploy_pipeline_id = oci_devops_deploy_pipeline.test_deploy_pipeline.id
+  deploy_stage_predecessor_collection {
+    items {
+      id = oci_devops_deploy_pipeline.test_deploy_pipeline.id
+    }
+  }
+  deploy_stage_type = "COMPUTE_INSTANCE_GROUP_BLUE_GREEN_DEPLOYMENT"
+  deployment_spec_deploy_artifact_id = oci_devops_deploy_artifact.test_deploy_artifact.id
+  description = "description"
+  display_name = "testBlueGreenDeployInstanceGroupStage"
+  failure_policy {
+    failure_count = "1"
+    policy_type = "COMPUTE_INSTANCE_GROUP_FAILURE_POLICY_BY_COUNT"
+  }
+  freeform_tags = {
+    "bar-key" = "value"
+  }
+  test_load_balancer_config {
+    backend_port = "8080"
+    listener_name = oci_load_balancer_listener.test_load_balancer_listener.name
+    load_balancer_id = oci_load_balancer_load_balancer.test_load_balancer.id
+  }
+  production_load_balancer_config {
+    backend_port = "8081"
+    listener_name = oci_load_balancer_listener.prod_load_balancer_listener.name
+    load_balancer_id = oci_load_balancer_load_balancer.prod_load_balancer.id
+  }
+  rollback_policy {
+    policy_type = "AUTOMATED_STAGE_ROLLBACK_POLICY"
+  }
+  rollout_policy {
+    batch_count = "5"
+    batch_delay_in_seconds = "10"
+    policy_type = "COMPUTE_INSTANCE_GROUP_LINEAR_ROLLOUT_POLICY_BY_COUNT"
+  }
+}
+
+resource "oci_devops_deploy_stage" "test_blue_green_traffic_shift_instance_group_stage" {
+  deploy_pipeline_id = oci_devops_deploy_pipeline.test_deploy_pipeline.id
+  deploy_stage_predecessor_collection {
+    items {
+      id = oci_devops_deploy_stage.test_blue_green_deploy_instance_group_stage.id
+    }
+  }
+  deploy_stage_type = "COMPUTE_INSTANCE_GROUP_BLUE_GREEN_TRAFFIC_SHIFT"
+  compute_instance_group_blue_green_deployment_deploy_stage_id = oci_devops_deploy_stage.test_blue_green_deploy_instance_group_stage.id
+  description = "description"
+  display_name = "testBlueGreenTrafficShiftInstanceGroupStage"
+  freeform_tags = {
+    "bar-key" = "value"
+  }
+}

examples/devops/deployment_service/blue_green_deploy_instance_group_stage/main.tf

@@ -0,0 +1,18 @@
+version: 1.0
+component: deployment
+runAs: root
+env:
+  variables:
+    version: "v1.0"
+files:
+  # This section is to define how the files in the artifact shall
+  # be put on the compute instance
+  - source: /
+    destination: /tmp/genericArtifactDemo
+steps:
+  # This section is to define the scripts that each step shall run on the instance after file copy.
+  - stepType: Command
+    name: Install Apache Web Server
+    command: ./script.sh
+    runAs: root
+    timeoutInSeconds: 800