Skip to content

Commit 4c9df1e

Browse files
authored
Releasing version 4.16.0
Releasing version 4.16.0
2 parents 6da679c + 30c6f75 commit 4c9df1e

File tree

7,134 files changed

+67836
-57447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,134 files changed

+67836
-57447
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 4.16.0 (Unreleased)
2+
3+
### Added
4+
- Support for File storage file system clones
5+
- Support for Log Analytics Entities
6+
- Support for Log Analytics Log Groups
7+
18
## 4.15.0 (February 24, 2021)
29

310
### Added

examples/log_analytics/entity.tf

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
/*
5+
* This example shows how to manage a log analytics entity
6+
*/
7+
8+
variable "managed_agent_id" {}
9+
10+
# Fetch namespace name from object store GET /n
11+
data "oci_objectstorage_namespace" "ns" {
12+
compartment_id = var.compartment_ocid
13+
}
14+
15+
# Sample create entity with required parameters.
16+
resource "oci_log_analytics_log_analytics_entity" "entityRequired" {
17+
compartment_id = var.compartment_ocid
18+
namespace = data.oci_objectstorage_namespace.ns.namespace
19+
name = "tf-entity-example-req"
20+
entity_type_name = "Host (Linux)"
21+
}
22+
23+
# Get details of above created entity with required parameters
24+
data "oci_log_analytics_log_analytics_entity" "entityRequiredDetails" {
25+
namespace = data.oci_objectstorage_namespace.ns.namespace
26+
log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityRequired.id
27+
}
28+
29+
# Sample create entity with optional parameters
30+
resource "oci_log_analytics_log_analytics_entity" "entityOptional" {
31+
compartment_id = var.compartment_ocid
32+
namespace = data.oci_objectstorage_namespace.ns.namespace
33+
name = "tf-entity-example-opt"
34+
entity_type_name = "Host (Linux)"
35+
management_agent_id = var.managed_agent_id
36+
hostname = "aa.domainname.com"
37+
timezone_region = "PST8PDT"
38+
properties = tomap({"JAVA_HOME" = "/usr/java/jdk1.8.0_202-amd64", "version" = "OEL-7uek"})
39+
freeform_tags = tomap({"servicegroup" = "test", "Dept" = "Devops"})
40+
}
41+
42+
# Get details of above created entity with optional parameters
43+
data "oci_log_analytics_log_analytics_entity" "entityOptionalDetails" {
44+
namespace = data.oci_objectstorage_namespace.ns.namespace
45+
log_analytics_entity_id = oci_log_analytics_log_analytics_entity.entityOptional.id
46+
}
47+
48+
# Get a list of entities with some query parameters
49+
data "oci_log_analytics_log_analytics_entities" "entitiesList" {
50+
compartment_id = var.compartment_ocid
51+
namespace = data.oci_objectstorage_namespace.ns.namespace
52+
state = "ACTIVE"
53+
lifecycle_details_contains = "READY"
54+
}
55+
56+
# Get an overall summary of entities
57+
data "oci_log_analytics_log_analytics_entities_summary" "entitiesSummary" {
58+
compartment_id = var.compartment_ocid
59+
namespace = data.oci_objectstorage_namespace.ns.namespace
60+
}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
/*
5+
* This example shows how to manage log analytics log groups
6+
*/
7+
8+
# Fetch namespace name from object store GET /n
9+
data "oci_objectstorage_namespace" "ns" {
10+
compartment_id = var.compartment_ocid
11+
}
12+
13+
# Create a log group with required parameters
14+
resource "oci_log_analytics_log_analytics_log_group" "logGroupRequired" {
15+
compartment_id = var.compartment_ocid
16+
namespace = data.oci_objectstorage_namespace.ns.namespace
17+
display_name = "tf-loggroup-example-req"
18+
}
19+
20+
# Get details of above created log group with required parameters
21+
data "oci_log_analytics_log_analytics_log_group" "logGroupRequiredDetails" {
22+
namespace = data.oci_objectstorage_namespace.ns.namespace
23+
log_analytics_log_group_id = oci_log_analytics_log_analytics_log_group.logGroupRequired.id
24+
}
25+
26+
# Create a log group with optional parameters
27+
resource "oci_log_analytics_log_analytics_log_group" "logGroupOptional" {
28+
compartment_id = var.compartment_ocid
29+
namespace = data.oci_objectstorage_namespace.ns.namespace
30+
display_name = "tf-loggroup-example-opt"
31+
description = "Log group with optional parameters"
32+
freeform_tags = tomap({"servicegroup" = "test", "Dept" = "Devops"})
33+
}
34+
35+
# Get details of above created log group with optional parameters
36+
data "oci_log_analytics_log_analytics_log_group" "logGroupOptionalDetails" {
37+
namespace = data.oci_objectstorage_namespace.ns.namespace
38+
log_analytics_log_group_id = oci_log_analytics_log_analytics_log_group.logGroupOptional.id
39+
}
40+
41+
# Get the list of log groups in a compartment
42+
data "oci_log_analytics_log_analytics_log_groups" "logGroupsList" {
43+
compartment_id = var.compartment_ocid
44+
namespace = data.oci_objectstorage_namespace.ns.namespace
45+
}
46+
47+
# Get the count of log groups in a compartment
48+
data "oci_log_analytics_log_analytics_log_groups_summary" "logGroupsSummary" {
49+
compartment_id = var.compartment_ocid
50+
namespace = data.oci_objectstorage_namespace.ns.namespace
51+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
resource "oci_file_storage_file_system" "my_fs_clone" {
2+
#Required
3+
availability_domain = data.oci_identity_availability_domain.ad.name
4+
compartment_id = var.compartment_ocid
5+
6+
#Optional
7+
display_name = var.file_system_clone_display_name
8+
source_snapshot_id = oci_file_storage_snapshot.my_snapshot_clone.id
9+
}
10+
resource "oci_file_storage_file_system" "my_fs_simple" {
11+
#Required
12+
availability_domain = data.oci_identity_availability_domain.ad.name
13+
compartment_id = var.compartment_ocid
14+
15+
#Optional
16+
display_name = var.file_system_simple_display_name
17+
}
18+
resource "oci_file_storage_snapshot" "my_snapshot_clone" {
19+
#Required
20+
file_system_id = oci_file_storage_file_system.my_fs_simple.id
21+
name = var.snapshot_name_clone
22+
}

examples/storage/fss/variables.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ variable "file_system_2_display_name" {
4242
default = "my_fs_2"
4343
}
4444

45+
variable "file_system_clone_display_name" {
46+
default= "my_fs_clone"
47+
}
48+
49+
variable "file_system_simple_display_name" {
50+
default= "my_fs_simple"
51+
}
52+
4553
variable "mount_target_1_display_name" {
4654
default = "my_mount_target_1"
4755
}
@@ -66,6 +74,10 @@ variable "snapshot_name" {
6674
default = "20180320_daily"
6775
}
6876

77+
variable "snapshot_name_clone" {
78+
default = "snapshot_clone"
79+
}
80+
6981
variable "export_set_name_1" {
7082
default = "export set for mount target 1"
7183
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
77
github.com/hashicorp/terraform-exec v0.6.0
88
github.com/hashicorp/terraform-plugin-sdk v1.15.0
9-
github.com/oracle/oci-go-sdk/v35 v35.3.0
9+
github.com/oracle/oci-go-sdk/v36 v36.0.0
1010
github.com/stretchr/objx v0.1.1 // indirect
1111
github.com/stretchr/testify v1.6.1
1212
golang.org/x/mod v0.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
200200
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
201201
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
202202
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
203-
github.com/oracle/oci-go-sdk/v35 v35.3.0 h1:hHM1I48CPzUnn8uT/X2C7Hlq4eF+K59hFo8q6bqWF2o=
204-
github.com/oracle/oci-go-sdk/v35 v35.3.0/go.mod h1:ahd0WhBivqXhNoeMIGThzpk9Ic7CpQiB9krgh0WEfRg=
203+
github.com/oracle/oci-go-sdk/v36 v36.0.0 h1:wDbkZipMBnOFxXtD6kntAWXMhT9aIc7Hp0nzXqS6kAI=
204+
github.com/oracle/oci-go-sdk/v36 v36.0.0/go.mod h1:t8Y/M3Lh8X4BOJhtThJKe1skRTg7qom7oWyHiNjo4RM=
205205
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
206206
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
207207
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

oci/analytics_analytics_instance_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88

99
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10-
oci_analytics "github.com/oracle/oci-go-sdk/v35/analytics"
10+
oci_analytics "github.com/oracle/oci-go-sdk/v36/analytics"
1111
)
1212

1313
func init() {

oci/analytics_analytics_instance_private_access_channel_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88

99
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10-
oci_analytics "github.com/oracle/oci-go-sdk/v35/analytics"
10+
oci_analytics "github.com/oracle/oci-go-sdk/v36/analytics"
1111
)
1212

1313
func init() {

oci/analytics_analytics_instance_private_access_channel_resource.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1616
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1717

18-
oci_analytics "github.com/oracle/oci-go-sdk/v35/analytics"
19-
oci_common "github.com/oracle/oci-go-sdk/v35/common"
18+
oci_analytics "github.com/oracle/oci-go-sdk/v36/analytics"
19+
oci_common "github.com/oracle/oci-go-sdk/v36/common"
2020
)
2121

2222
func init() {

0 commit comments

Comments
 (0)