Skip to content

Commit

Permalink
Merge pull request #2 from oracle-quickstart/issue-1-metadata
Browse files Browse the repository at this point in the history
Release metadata
  • Loading branch information
andrecorreaneto authored Jul 3, 2023
2 parents 21ec403 + c397201 commit f0eefee
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This repository is part of a broader collection of repositories containing modul
- [Identity & Access Management](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-iam)
- [Networking](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-networking)
- [Governance](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-governance) - current repository
- Security - coming soon
- [Security](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-security)
- [Observability & Monitoring](https://github.com/oracle-quickstart/terraform-oci-cis-landing-zone-observability)

The modules in this collection are designed for flexibility, are straightforward to use, and enforce CIS OCI Foundations Benchmark recommendations when possible.
Expand Down
8 changes: 8 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# July 03, 2023 Release Notes - 0.1.1

## Updated
1. [Release Metadata](#0-1-1-metadata)

### <a name="0-1-1-metadata">Release Metadata</a>
Managed resources are tagged with release metadata.

# March 23, 2023 Release Notes - 0.1.0

## Added
Expand Down
1 change: 1 addition & 0 deletions release.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.1.1
7 changes: 7 additions & 0 deletions tags/metadata.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright (c) 2023 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

#-- Used to inform module and release number.
locals {
cislz_module_tag = {"cislz-terraform-module" : fileexists("${path.module}/../release.txt") ? "${var.module_name}/${file("${path.module}/../release.txt")}" : "${var.module_name}"}
}
6 changes: 3 additions & 3 deletions tags/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

output "tag_namespaces" {
description = "The tag namespaces."
value = oci_identity_tag_namespace.these
value = var.enable_output ? oci_identity_tag_namespace.these : null
}

output "tags" {
description = "The tags."
value = oci_identity_tag.these
value = var.enable_output ? oci_identity_tag.these : null
}

output "tag_defaults" {
description = "The tag defaults."
value = oci_identity_tag_default.these
value = var.enable_output ? oci_identity_tag_default.these : null
}
14 changes: 13 additions & 1 deletion tags/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,16 @@ variable "tags_configuration" {
})))
})))
})
}
}

variable enable_output {
description = "Whether Terraform should enable module output."
type = bool
default = true
}

variable module_name {
description = "The module name."
type = string
default = "streams"
}

0 comments on commit f0eefee

Please sign in to comment.