From 4525cc8c2db13a4e3d3f2833609d2155719ccdfb Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 19 Nov 2025 17:52:26 -0500 Subject: [PATCH] current --- .../modules/eks_deployment.github_repo | 2 +- .../basic/.terraform/modules/modules.json | 2 +- examples/basic/main.tf | 21 ++++--- examples/mojo-cubestr-dev/.terraform_commits | 62 +++++++++++++++++++ examples/mojo-cubestr-dev/main.tf | 45 ++++++++++++++ examples/mojo-cubestr-dev/providers.tf | 2 + .../mojo-cubestr-dev/varfiles/default.json | 1 + examples/ois-misp-prod/main.tf | 45 ++++++++++++++ examples/ois-misp-prod/providers.tf | 2 + examples/ois-misp-prod/varfiles/default.json | 1 + main.tf | 4 +- providers.tf | 4 +- 12 files changed, 176 insertions(+), 15 deletions(-) create mode 100644 examples/mojo-cubestr-dev/.terraform_commits create mode 100644 examples/mojo-cubestr-dev/main.tf create mode 100644 examples/mojo-cubestr-dev/providers.tf create mode 100644 examples/mojo-cubestr-dev/varfiles/default.json create mode 100644 examples/ois-misp-prod/main.tf create mode 100644 examples/ois-misp-prod/providers.tf create mode 100644 examples/ois-misp-prod/varfiles/default.json diff --git a/examples/basic/.terraform/modules/eks_deployment.github_repo b/examples/basic/.terraform/modules/eks_deployment.github_repo index b6b6cba..5505602 160000 --- a/examples/basic/.terraform/modules/eks_deployment.github_repo +++ b/examples/basic/.terraform/modules/eks_deployment.github_repo @@ -1 +1 @@ -Subproject commit b6b6cba8c08f2997b7a4058c421d41744ef7793d +Subproject commit 55056023f741b88f3080086155ffce213b7d8309 diff --git a/examples/basic/.terraform/modules/modules.json b/examples/basic/.terraform/modules/modules.json index 2ad9006..cdcf921 100644 --- a/examples/basic/.terraform/modules/modules.json +++ b/examples/basic/.terraform/modules/modules.json @@ -1 +1 @@ -{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"eks_deployment","Source":"../..","Dir":"../.."},{"Key":"eks_deployment.github_repo","Source":"registry.terraform.io/HappyPathway/repo/github","Version":"1.0.83","Dir":".terraform/modules/eks_deployment.github_repo"}]} \ No newline at end of file +{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"eks_deployment","Source":"../..","Dir":"../.."},{"Key":"eks_deployment.github_repo","Source":"git::ssh://git@github.e.it.census.gov/CSVD/terraform-github-repo.git","Dir":".terraform/modules/eks_deployment.github_repo"}]} \ No newline at end of file diff --git a/examples/basic/main.tf b/examples/basic/main.tf index 52055dc..4bef0dd 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -10,24 +10,27 @@ module "eks_deployment" { source = "../../" # Repository and cluster configuration - single name for both - name = "eks-test-cluster" + name = "mojo-cubestore-dev" environment = "dev" region = "us-gov-east-1" # Cluster configuration - simplified interface cluster_config = { - account_name = "csvd-dev-ew" - aws_account_id = "229685449397" + account_name = "ma6-gov" + aws_account_id = "252960665057" + cluster_mailing_list = "adep.mojo.development.list@census.gov" environment_abbr = "dev" - vpc_name = "vpc3-csvd-dev" - vpc_domain_name = "dev.inf.csp1.census.gov" - cluster_mailing_list = "david.j.arnold.jr@census.gov" + finops_project_name = "PPSI_DICE" + finops_project_number = "fs0000000015" + finops_project_role = "dice:dev:mojo" + vpc_domain_name = "dev.dice.census.gov" + vpc_name = "vpc2-dice-dev" tags = { - Owner = "Platform Team" + Owner = "PETeam" Environment = "Development" - CostCenter = "123-456" + CostCenter = "fs0000000015" } - organization = "census:ocio:csvd" + organization = "census:ocio:dice" } } diff --git a/examples/mojo-cubestr-dev/.terraform_commits b/examples/mojo-cubestr-dev/.terraform_commits new file mode 100644 index 0000000..5b4199e --- /dev/null +++ b/examples/mojo-cubestr-dev/.terraform_commits @@ -0,0 +1,62 @@ +[ + { + "commit_hash": "2d1a9976c65f53b370b4a3ff0829394449127d5a", + "commit_message": "Fix formatting of runs-on value in GitHub Actions workflow", + "author": "Your Name", + "timestamp": "2025-09-04T13:49:32.940158" + }, + { + "commit_hash": "2d1a9976c65f53b370b4a3ff0829394449127d5a", + "commit_message": "Fix formatting of runs-on value in GitHub Actions workflow", + "author": "Your Name", + "timestamp": "2025-09-04T13:52:48.384810" + }, + { + "commit_hash": "2d1a9976c65f53b370b4a3ff0829394449127d5a", + "commit_message": "Fix formatting of runs-on value in GitHub Actions workflow", + "author": "Your Name", + "timestamp": "2025-09-04T14:36:08.594715" + }, + { + "commit_hash": "2d1a9976c65f53b370b4a3ff0829394449127d5a", + "commit_message": "Fix formatting of runs-on value in GitHub Actions workflow", + "author": "Your Name", + "timestamp": "2025-09-04T15:59:08.094373" + }, + { + "commit_hash": "94a518393002dd67ec0a178aee46323921889767", + "commit_message": "Refactor README and ROADMAP for clarity; update Terraform configurations and remove deprecated variables", + "author": "Your Name", + "timestamp": "2025-09-05T13:52:50.300053" + }, + { + "commit_hash": "94a518393002dd67ec0a178aee46323921889767", + "commit_message": "Refactor README and ROADMAP for clarity; update Terraform configurations and remove deprecated variables", + "author": "Your Name", + "timestamp": "2025-09-05T13:57:43.873358" + }, + { + "commit_hash": "94a518393002dd67ec0a178aee46323921889767", + "commit_message": "Refactor README and ROADMAP for clarity; update Terraform configurations and remove deprecated variables", + "author": "Your Name", + "timestamp": "2025-09-08T13:08:10.570707" + }, + { + "commit_hash": "94a518393002dd67ec0a178aee46323921889767", + "commit_message": "Refactor README and ROADMAP for clarity; update Terraform configurations and remove deprecated variables", + "author": "Your Name", + "timestamp": "2025-09-10T15:25:49.548237" + }, + { + "commit_hash": "1694ff2abd5271962c65bf1a8798c15cfdcd0af9", + "commit_message": "Update main.tf", + "author": "David John Arnold Jr", + "timestamp": "2025-09-10T17:11:02.705468" + }, + { + "commit_hash": "1694ff2abd5271962c65bf1a8798c15cfdcd0af9", + "commit_message": "Update main.tf", + "author": "David John Arnold Jr", + "timestamp": "2025-09-10T17:17:55.685167" + } +] \ No newline at end of file diff --git a/examples/mojo-cubestr-dev/main.tf b/examples/mojo-cubestr-dev/main.tf new file mode 100644 index 0000000..7e767e8 --- /dev/null +++ b/examples/mojo-cubestr-dev/main.tf @@ -0,0 +1,45 @@ +data "aws_secretsmanager_secret_version" "github_token" { + secret_id = "/eks-cluster-deployment/github_token" +} + +provider "github" { + token = data.aws_secretsmanager_secret_version.github_token.secret_string +} + +module "eks_deployment" { + source = "../../" + + # Repository and cluster configuration - single name for both + name = "mojo-cubestr-dev" + environment = "dev" + region = "us-gov-east-1" + + # Cluster configuration - simplified interface + cluster_config = { + account_name = "ma6-gov" + aws_account_id = "252960665057" + cluster_mailing_list = "adep.mojo.development.list@census.gov" + environment_abbr = "dev" + finops_project_name = "PPSI_DICE" + finops_project_number = "fs0000000015" + finops_project_role = "dice:dev:mojo" + vpc_domain_name = "dev.dice.census.gov" + vpc_name = "vpc2-dice-dev" + tags = { + Owner = "PETeam" + Environment = "Development" + CostCenter = "fs0000000015" + } + organization = "census:ocio:dice" + } +} + +output "repository_url" { + description = "URL of the created GitHub repository" + value = module.eks_deployment.repository_url +} + +output "ssh_clone_url" { + description = "SSH clone URL of the repository" + value = module.eks_deployment.ssh_clone_url +} diff --git a/examples/mojo-cubestr-dev/providers.tf b/examples/mojo-cubestr-dev/providers.tf new file mode 100644 index 0000000..8c9ebd1 --- /dev/null +++ b/examples/mojo-cubestr-dev/providers.tf @@ -0,0 +1,2 @@ +provider "aws" { +} diff --git a/examples/mojo-cubestr-dev/varfiles/default.json b/examples/mojo-cubestr-dev/varfiles/default.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/examples/mojo-cubestr-dev/varfiles/default.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/examples/ois-misp-prod/main.tf b/examples/ois-misp-prod/main.tf new file mode 100644 index 0000000..653ab8e --- /dev/null +++ b/examples/ois-misp-prod/main.tf @@ -0,0 +1,45 @@ +data "aws_secretsmanager_secret_version" "github_token" { + secret_id = "/eks-cluster-deployment/github_token" +} + +provider "github" { + token = data.aws_secretsmanager_secret_version.github_token.secret_string +} + +module "eks_deployment" { + source = "../../" + + # Repository and cluster configuration - single name for both + name = "ois-misp-prod" + environment = "prod" + region = "us-gov-east-1" + + # Cluster configuration - simplified interface + cluster_config = { + account_name = "ois-misp-prod-gov" + aws_account_id = "399570725053" + cluster_mailing_list = "ois.misp.list@census.gov" + environment_abbr = "prod" + finops_project_name = "OIS_MISP" + finops_project_number = "fs0000000102" + finops_project_role = "OIS_MISP_APP" + vpc_domain_name = "shared.inf.csp1.census.gov" + vpc_name = "vpc2-inf-shared" + tags = { + Owner = "ois.misp.list@census.gov" + Environment = "production" + CostCenter = "ocio:ois-misp" + } + organization = "census:ocio:ois" + } +} + +output "repository_url" { + description = "URL of the created GitHub repository" + value = module.eks_deployment.repository_url +} + +output "ssh_clone_url" { + description = "SSH clone URL of the repository" + value = module.eks_deployment.ssh_clone_url +} diff --git a/examples/ois-misp-prod/providers.tf b/examples/ois-misp-prod/providers.tf new file mode 100644 index 0000000..8c9ebd1 --- /dev/null +++ b/examples/ois-misp-prod/providers.tf @@ -0,0 +1,2 @@ +provider "aws" { +} diff --git a/examples/ois-misp-prod/varfiles/default.json b/examples/ois-misp-prod/varfiles/default.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/examples/ois-misp-prod/varfiles/default.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/main.tf b/main.tf index c188c00..2400cf3 100644 --- a/main.tf +++ b/main.tf @@ -85,7 +85,7 @@ module "github_repo" { template_repo_org = local.repository_defaults.template_owner template_repo = local.repository_defaults.template - github_is_private = var.is_private + github_is_private = false github_has_issues = true github_has_wiki = true github_has_projects = true @@ -118,4 +118,4 @@ output "repository_url" { output "ssh_clone_url" { description = "SSH clone URL of the repository" value = module.github_repo.ssh_clone_url -} \ No newline at end of file +} diff --git a/providers.tf b/providers.tf index c5ea7b3..fd4066f 100644 --- a/providers.tf +++ b/providers.tf @@ -2,11 +2,11 @@ terraform { required_providers { github = { source = "integrations/github" - version = ">= 5.0" + version = ">= 6.6.0, < 6.7.0" } aws = { source = "hashicorp/aws" version = ">= 5.0" } } -} \ No newline at end of file +}