Merge pull request #200 from sassoftware/staging

5.6.1 - March 28, 2023
sassoftware · Mar 28, 2023 · cde9f3e · cde9f3e
2 parents b647da7 + 42c5a97
commit cde9f3e
Show file tree

Hide file tree

Showing 27 changed files with 81 additions and 0 deletions.
diff --git a/container-structure-test.yaml b/container-structure-test.yaml
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 schemaVersion: "2.0.0"
 
 fileExistenceTests:

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/custom-data/additional_userdata.sh b/files/custom-data/additional_userdata.sh
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 ##
 # 
 # For AWS this is a script 'snippet' that is injected into another script

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,5 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 
 locals {
 

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
+
 ## AWS-EKS
 #
 # Terraform Registry : https://registry.terraform.io/namespaces/terraform-aws-modules

diff --git a/modules/aws_autoscaling/main.tf b/modules/aws_autoscaling/main.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 # Permissions based off the IAM Policy recommended by kubernetes/autoscaler
 # https://github.com/kubernetes/autoscaler/blob/cluster-autoscaler-chart-9.25.0/cluster-autoscaler/cloudprovider/aws/README.md
 data "aws_iam_policy_document" "worker_autoscaling" {

diff --git a/modules/aws_autoscaling/output.tf b/modules/aws_autoscaling/output.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 output "autoscaler_account" {
   value = module.iam_assumable_role_with_oidc.iam_role_arn
 }
diff --git a/modules/aws_autoscaling/variables.tf b/modules/aws_autoscaling/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 AWS Cloud resources created by this script"
   type        = string

diff --git a/modules/aws_ebs_csi/main.tf b/modules/aws_ebs_csi/main.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 resource "aws_iam_policy" "ebs_csi" {
   name_prefix = "${var.prefix}-ebs-csi-policy"
   description = "EKS ebs csi policy for cluster ${var.cluster_name}"

diff --git a/modules/aws_ebs_csi/outputs.tf b/modules/aws_ebs_csi/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 "ebs_csi_account" {
   value = module.iam_assumable_role_with_oidc.iam_role_arn
 }
diff --git a/modules/aws_ebs_csi/variables.tf b/modules/aws_ebs_csi/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 AWS Cloud resources created by this script"
   type        = string

diff --git a/modules/aws_vm/main.tf b/modules/aws_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
+
 # Reference: https://github.com/terraform-providers/terraform-provider-aws
 
 # Hack for assigning disk in a vm based on an index value. 

diff --git a/modules/aws_vm/outputs.tf b/modules/aws_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_address" {
   value = aws_instance.vm.private_ip
 }

diff --git a/modules/aws_vm/variables.tf b/modules/aws_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/aws_vpc/main.tf b/modules/aws_vpc/main.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 # This is customized based on - https://github.com/terraform-aws-modules/terraform-aws-vpc
 
 locals {

diff --git a/modules/aws_vpc/outputs.tf b/modules/aws_vpc/outputs.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 #vpc_id
 output "vpc_id" {
   description = "VPC id"

diff --git a/modules/aws_vpc/variables.tf b/modules/aws_vpc/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 "azs" {
   description = "A list of availability zones names or ids in the region"
   type        = list(string)

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
+
 locals {
   service_account_name        = "${var.prefix}-cluster-admin-sa"
   cluster_role_binding_name   = "${var.prefix}-cluster-admin-crb"

diff --git a/modules/kubeconfig/output.tf b/modules/kubeconfig/output.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 = local_file.kubeconfig.content
 }
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/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_endpoint" {
   description = "Endpoint for EKS control plane."
   value       = module.eks.cluster_endpoint

diff --git a/security.tf b/security.tf
@@ -1,3 +1,6 @@
+# Copyright © 2021-2023, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 data "aws_security_group" "sg" {
   count = var.security_group_id == null ? 0 : 1
   id    = var.security_group_id

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
+
 ## Global
 variable "prefix" {
   description = "A prefix used in the name for all cloud resources created by this script. The prefix string must start with a lowercase letter and contain only alphanumeric characters and hyphens or dashes (-), but cannot start or end with '-'."

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"
   required_providers {

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"
     ? ""