Merge pull request #166 from sassoftware/staging

jarpat · web-flow · commit 7582f8950eae · 2023-03-28T13:34:47.000-04:00
4.3.1 - March 28, 2023
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
+
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 set -e
 
 # setup container user
diff --git a/files/tools/iac_git_info.sh b/files/tools/iac_git_info.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 # We need to return an error if things don't work
 set -e
 
diff --git a/files/tools/iac_tooling_version.sh b/files/tools/iac_tooling_version.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 # We need to return an error if things don't work
 set -e
 
diff --git a/locals.tf b/locals.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 locals {
 
   # General
diff --git a/main.tf b/main.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 ## GCP-GKE
 #
 # Terraform Registry : https://registry.terraform.io/namespaces/terraform-google-modules
diff --git a/modules/google_vm/main.tf b/modules/google_vm/main.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 module "address" {
   source       = "terraform-google-modules/address/google"
   version      = "3.1.1"
diff --git a/modules/google_vm/outputs.tf b/modules/google_vm/outputs.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 output "private_ip" {
   value = google_compute_instance.google_vm.network_interface.0.network_ip
 }
diff --git a/modules/google_vm/variables.tf b/modules/google_vm/variables.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 variable "name" {
   type = string
 }
diff --git a/modules/kubeconfig/locals.tf b/modules/kubeconfig/locals.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 # Local variables
 locals {
 
diff --git a/modules/kubeconfig/main.tf b/modules/kubeconfig/main.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 # Create service account secret
 resource "kubernetes_secret" "sa_secret" {
   count = var.create_static_kubeconfig ? 1 : 0
diff --git a/modules/kubeconfig/outputs.tf b/modules/kubeconfig/outputs.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 output "kube_config" {
   value = var.create_static_kubeconfig ? local.kube_config_sa : local.kube_config_provider
 }
diff --git a/modules/kubeconfig/variables.tf b/modules/kubeconfig/variables.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 variable "prefix" {
   description = "A prefix used for all Google Cloud resources created by this script"
   type        = string
diff --git a/modules/network/main.tf b/modules/network/main.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 data "google_compute_network" "vpc" {
   count = length(var.vpc_name) == 0 ? 0 : 1
   name  = var.vpc_name
diff --git a/modules/network/outputs.tf b/modules/network/outputs.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 output "network_name" {
   value = length(var.vpc_name) == 0 ? element(coalescelist(google_compute_network.vpc.*.name, [" "]), 0) : var.vpc_name
 }
diff --git a/modules/network/variables.tf b/modules/network/variables.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 variable "prefix" {
   type = string
 }
diff --git a/network.tf b/network.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 data "google_compute_address" "nat_address" {
   count   = length(var.nat_address_name) == 0 ? 0 : 1
   name    = var.nat_address_name
diff --git a/outputs.tf b/outputs.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 output "cluster_name" {
   description = "GKE Cluster name"
   value       = module.gke.name
diff --git a/variables.tf b/variables.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 variable "prefix" {
   description = "A prefix used in the name for all cloud resources created by this script. The prefix string must start with lowercase letter and contain only lowercase alphanumeric characters and hyphen or dash(-), but can not start or end with '-'."
   validation {
diff --git a/versions.tf b/versions.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 terraform {
   required_version = ">= 1.0.0"
 
diff --git a/vms.tf b/vms.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 locals {
   rwx_filestore_endpoint = (var.storage_type == "none"
     ? ""

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.`
	`2`	`+# SPDX-License-Identifier: Apache-2.0`
	`3`	`+`
`1`	`4`	`## GCP-GKE`
`2`	`5`	`#`
`3`	`6`	`# Terraform Registry : https://registry.terraform.io/namespaces/terraform-google-modules`