Skip to content

Commit 5f88108

Browse files
committed
Release v2.0.0
1 parent fb29dc7 commit 5f88108

File tree

8 files changed

+84
-82
lines changed

8 files changed

+84
-82
lines changed

CHANGELOG.md

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -11,92 +11,50 @@ Given a version number MAJOR.MINOR.PATCH:
1111
- MINOR version when adding functionality in a backwards compatible manner,
1212
- PATCH version when making backwards compatible bug fixes.
1313

14-
## [Unreleased]
15-
16-
### Changed
17-
18-
- bump Copyright notice to 2021
19-
20-
## [2.1.3] 2021-01-19
21-
22-
### Fixed
23-
24-
- update documentation links to use absolute paths (Terraform Registry do not support relative paths)
25-
- update image link
26-
27-
## [2.1.2] 2021-01-05
14+
## [2.0.0] - 2021-01-27
2815

2916
### Added
3017

31-
- clarify documentation regarding provider configuration requirements for OCI IAM resources (you must you home region)
18+
#### New features
3219

33-
## [2.1.1] 2020-12-22
20+
- delete a compartment
21+
- create a sub-compartment
22+
- create a list of oci users
23+
- set email of oci user
3424

35-
### Added
25+
#### Documentation
3626

37-
- variables: type constraints defined for all variables,
38-
- variables: default value is `null` if there is no other advisable value,
39-
- ouputs: user_description output for iam-user module,
40-
- terraform and OCI terraform provider version pinning block,
41-
- examples: add a README
27+
- CHANGELOG following [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) format
28+
- CONTRIBUTING guide
29+
- prerequisites section with the required Terraform and Terraform Provider versions
30+
- clarify provider configuration requirements for OCI IAM resources (you must your home region)
31+
- README for /examples
32+
- examples on how to use the new features of this module
4233

4334
### Changed
4435

45-
Documentation update:
46-
47-
- update README files to use relative links for content coming from this repo
48-
- Update oci provider URL to registry.terraform.io
49-
- update the prerequisites and usage section for each submodule
50-
- add a column with default value for each variable
51-
52-
Resources:
36+
#### Resources
5337

5438
- `count` tests with true/false for boolean variables,
5539
- `count` tests with null or variable length for arrays.
5640

57-
### Fixed
41+
#### modules/*
5842

59-
- iam-user: email can be empty if value is set to `null`
60-
61-
## [2.1.0] 2020-12-15
62-
63-
### Added
43+
- terraform and OCI terraform provider version pinning block : Terraform 0.12 and OCI Provider 3.27 or greater
44+
- new outputs for each sub-modules
45+
- typed variables
46+
- variables default value is `null` if there is no better advisable value
6447

65-
- More current README.md for the example folder. Also add a sample apply output.
66-
67-
#### Module - iam-compartment, iam-group, iam-dynamic-group
68-
69-
- More complete outputs. oci-compartment now also expose the parent compartment ocid,
70-
- add a new combined output name -> ocid
71-
72-
### Changed
73-
74-
#### Module - iam-compartment
48+
#### modules/iam-compartment
7549

7650
- compartment_name and compartment_description are now mandatory (default value is null),
7751
- compartment_id is now optional: if the parent compartment ID is not specified, the compartment is created at the root level of the tenancy
7852

79-
#### Module - iam-user
53+
#### modules/iam-user
8054

8155
- name and description are now mandatory (default value is null)
8256

8357
### Fixed
8458

85-
- update modules and examples to not use deprecated interpolation syntax anymore,
86-
- update examples to show how to use the 2.x.x features of this module.
87-
88-
## [2.0.1] 2020-12-14
89-
90-
### Added
91-
92-
- repo maintenance: starts this CHANGELOG.md
93-
- update README.md prerequisites section with the required Terraform and Terraform Provider versions
94-
95-
### Changed
96-
97-
- repo maintenance: updates Copyright to 2020
98-
- repo maintenance: .gitignore and .gitattributes adjusted files for cleaner repo
99-
100-
### Removed
101-
102-
- Resource "watermark" with freeform tags - may be reintroduced later in a more flexible manner
59+
- Issues: #11 #12 #16
60+
- no more deprecated interpolation syntax in modules and examples

CONTRIBUTING.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# CONTRIBUTING
2+
3+
Oracle welcomes contributions to this repository from anyone.
4+
5+
If you want to submit a pull request to fix a bug or enhance an existing feature, please first open an issue and link to that issue when you submit your pull request.
6+
7+
If you have any questions about a possible submission, feel free to open an issue too.
8+
9+
## Contributing to the terraform-oci-iam repository
10+
11+
Pull requests can be made under The Oracle Contributor Agreement(OCA).
12+
13+
For pull requests to be accepted, the bottom of your commit message must have the following line using your name and e-mail address as it appears in the OCA Signatories list.
14+
15+
`Signed-off-by: Your Name <[email protected]>`
16+
17+
This can be automatically added to pull requests by committing with:
18+
19+
`git commit --signoff`
20+
21+
or by turning on the "Always Sign Off" flag in your IDE's preferences.
22+
23+
Only pull requests from committers that can be verified as having signed the OCA can be accepted.
24+
25+
## Pull request process
26+
27+
1. Fork this repository
28+
29+
1. Create a branch in your own fork to implement the changes. We recommend using the issue number as part of your branch name, e.g.: `1234-fixes`
30+
31+
1. Ensure that any documentation is updated with the changes that are required by your fix
32+
33+
1. Update README.md when necessary
34+
35+
1. Ensure that any samples are updated if the base image has been changed
36+
37+
1. Update CHANGELOG.md - add information about the changes that are done in this pull request, increment the version
38+
39+
1. Tag your branch with the new version
40+
41+
1. Submit the pull request. **Do not leave the pull request description blank**. Explain exactly what your changes are meant to do and provide simple steps on how to validate your changes. Ensure that you reference the issue you created as well adding `#1234` to the description. We will assign the pull request to 2-3 people for review before it is merged.

LICENSE.txt renamed to LICENSE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,5 @@ END OF TERMS AND CONDITIONS
7979
distributed under the License is distributed on an "AS IS" BASIS,
8080
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
8181
See the License for the specific language governing permissions and
82-
limitations under the License.
82+
limitations under the License.
83+

README.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Note: the root folder of this module contains no Terraform code: it groups toget
66

77
The file and directory layout follows the [Terraform Standard Module Structure](https://www.terraform.io/docs/modules/structure.html):
88

9-
* [modules](https://github.com/kral2/terraform-oci-iam/tree/master/modules) folder contains several standalone, reusable, submodules for creating IAM resources in Oracle Cloud Infrastructure,
10-
* [examples](https://github.com/kral2/terraform-oci-iam/tree/master/examples) folder contains fully-functional examples that you can copy and paste "as is" to have a first look at the submodules capabilities.
9+
* [modules](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/modules) folder contains several standalone, reusable, submodules for creating IAM resources in Oracle Cloud Infrastructure,
10+
* [examples](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/examples) folder contains fully-functional examples that you can copy and paste "as is" to have a first look at the submodules capabilities.
1111

1212
## Maintainers
1313

@@ -53,7 +53,7 @@ The first OCI Terraform provider version to work with Terraform v0.12 is provide
5353

5454
The diagram below summarizes the required components and their respective versions to use this module.
5555

56-
![versions](https://github.com/kral2/terraform-oci-iam/blob/master/docs/diagrams/versions.svg?raw=true&sanitize=true)
56+
![versions](https://github.com/oracle-terraform-modules/terraform-oci-iam/blob/master/docs/diagrams/versions.svg?raw=true&sanitize=true)
5757

5858
To enforce versions compatibility of both Terraform and the OCI provider, your root configuration should ideally include this block in main.tf for version pinning:
5959

@@ -79,7 +79,7 @@ You should always pin the version of this module in your configuration: add the
7979
```HCL
8080
module "iam" {
8181
source = "oracle-terraform-modules/iam/oci"
82-
version = "2.1.1"
82+
version = "2.0.0"
8383
}
8484
```
8585

@@ -98,11 +98,11 @@ Note:
9898
- *When using the oci-iam modules, or more generally when manipulating iam resources, **be sure to configure your oci provider to use the tenancy's home region**, as IAM resources can only be managed from the home region.*
9999
- To combine this template with non-iam resources provisioned in a region different from your *home region*, you will need to use [provider aliases](https://www.terraform.io/docs/configuration/providers.html#alias-multiple-provider-configurations).
100100

101-
The available submodules are listed below with example block codes. For fully-functional examples, please see [examples](https://github.com/kral2/terraform-oci-iam/tree/master/examples).
101+
The available submodules are listed below with example block codes. For fully-functional examples, please see [examples](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/examples).
102102

103103
### Declaring OCI Compartments with iam-compartment
104104

105-
See a basic example below and [the iam-compartment readme](https://github.com/kral2/terraform-oci-iam/tree/master/modules/iam-compartment) for details.
105+
See a basic example below and [the iam-compartment readme](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/modules/iam-compartment) for details.
106106

107107
* To create a compartment at the root level of the tenancy, insert this block in your root configuration:
108108

@@ -134,14 +134,14 @@ module "iam_subcompartment" {
134134

135135
### Declaring a list of OCI Users with iam-user
136136

137-
See a basic example below and [the iam-user readme](https://github.com/kral2/terraform-oci-iam/tree/master/modules/iam-user) for details.
137+
See a basic example below and [the iam-user readme](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/modules/iam-user) for details.
138138

139139
* To create a list of users, insert this block in your root configuration:
140140

141141
```HCL
142142
module "iam_users" {
143143
source = "oracle-terraform-modules/iam/oci//modules/iam-user"
144-
version = "2.1.1"
144+
version = "2.0.0"
145145
tenancy_ocid = var.tenancy_ocid # required
146146
users = [ # a list of users
147147
{ # user1
@@ -165,14 +165,14 @@ module "iam_users" {
165165

166166
### Declaring OCI Groups with iam-group
167167

168-
See a basic example below and [the iam-group readme](https://github.com/kral2/terraform-oci-iam/tree/master/modules/iam-group) for details.
168+
See a basic example below and [the iam-group readme](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/modules/iam-group) for details.
169169

170170
* To create a group, add previously declared users as members and create an IAM policy in the previously declared compartment, insert this block in your root configuration:
171171

172172
```HCL
173173
module "iam_group" {
174174
source = "oracle-terraform-modules/iam/oci//modules/iam-group"
175-
version = "2.1.1"
175+
version = "2.0.0"
176176
tenancy_ocid = var.tenancy_ocid # required
177177
group_name = "tf_example_group" # required
178178
group_description = "an example group - terraformed" # required
@@ -189,7 +189,7 @@ module "iam_group" {
189189

190190
### Declaring OCI Dynamic Groups with iam-dynamic-group
191191

192-
See a basic example below and [the iam-dynamic-group readme](https://github.com/kral2/terraform-oci-iam/tree/master/modules/iam-dynamic-groupd) for details.
192+
See a basic example below and [the iam-dynamic-group readme](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/modules/iam-dynamic-group) for details.
193193

194194
* To create a dynamic group with a matching rule, and create an IAM policy in the previously declared compartment, insert this block in your root configuration:
195195

@@ -213,10 +213,12 @@ module "iam_dynamic_group" {
213213

214214
This project is open source. Oracle appreciates any contributions that are made by the open source community.
215215

216+
Learn how to [contribute](https://github.com/oracle-terraform-modules/terraform-oci-iam/blob/master/CONTRIBUTING.md).
217+
216218
## License
217219

218220
Copyright (c) 2018, 2021, Oracle and/or its affiliates.
219221

220222
Licensed under the Universal Permissive License 1.0 or Apache License 2.0.
221223

222-
See [LICENSE](https://github.com/oracle-terraform-modules/terraform-oci-iam/blob/master/LICENSE.txt) for more details.
224+
See [LICENSE](https://github.com/oracle-terraform-modules/terraform-oci-iam/blob/master/LICENSE) for more details.

modules/iam-compartment/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module "iam_subcompartment" {
3838
}
3939
```
4040

41-
Check out the [examples](https://github.com/kral2/terraform-oci-iam/tree/master/examples) for fully-working sample code.
41+
Check out the [examples](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/examples) for fully-working sample code.
4242

4343
Note the following parameters:
4444

modules/iam-dynamic-group/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module "iam_dynamic_group" {
1818
}
1919
```
2020

21-
Check out the [examples](https://github.com/kral2/terraform-oci-iam/tree/master/examples) for fully-working sample code.
21+
Check out the [examples](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/examples) for fully-working sample code.
2222

2323
Note the following parameters:
2424

modules/iam-group/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module "iam_group" {
2525
}
2626
```
2727

28-
Check out the [examples](https://github.com/kral2/terraform-oci-iam/tree/master/examples) folder for fully-working sample code.
28+
Check out the [examples](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/examples) folder for fully-working sample code.
2929

3030
Note the following parameters:
3131

modules/iam-user/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module "iam_users" {
3131
}
3232
```
3333

34-
Check out the [examples](https://github.com/kral2/terraform-oci-iam/tree/master/examples) folder for fully-working sample code.
34+
Check out the [examples](https://github.com/oracle-terraform-modules/terraform-oci-iam/tree/master/examples) folder for fully-working sample code.
3535

3636
Note the following parameters for the module:
3737

0 commit comments

Comments
 (0)