From df314a47599987fbbe4ccdcf17883d78289e8fc1 Mon Sep 17 00:00:00 2001 From: Bonthu Date: Fri, 26 Aug 2022 16:18:46 +0100 Subject: [PATCH] Org updated to repo --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 6 ++++-- CODEOWNERS | 2 +- README.md | 2 +- docs/index.md | 2 +- examples/existing-cluster-with-base-and-infra/main.tf | 6 +++--- modules/add-ons/adot-operator/README.md | 2 +- modules/add-ons/adot-operator/main.tf | 2 +- modules/workloads/infra/README.md | 2 +- modules/workloads/infra/main.tf | 2 +- modules/workloads/java/main.tf | 2 +- tfsec.yaml | 2 +- 12 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index ec249f3..d206f88 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -20,7 +20,7 @@ body: attributes: label: Welcome to Amazon EKS Blueprints! options: - - label: Yes, I've searched similar issues on [GitHub](https://github.com/aws-ia/terraform-aws-observability-accelerator/issues) and didn't find any. + - label: Yes, I've searched similar issues on [GitHub](https://github.com/aws-observability/terraform-aws-observability-accelerator/issues) and didn't find any. required: true - type: input diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 282a997..9f0f8cf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,6 +3,8 @@ +🛑 Please open an issue first to discuss any significant work and flesh out details/direction - we would hate for your time to be wasted. Consult the CONTRIBUTING guide for submitting pull-requests. + ### Motivation @@ -12,9 +14,9 @@ ### More - [ ] Yes, I have tested the PR using my local account setup (Provide any test evidence report under Additional Notes) -- [ ] Yes, I have added a new example under [examples](https://github.com/aws-ia/terraform-aws-eks-blueprints/tree/main/examples) to support my PR +- [ ] Yes, I have added a new example under [examples](https://github.com/aws-observability/terraform-aws-eks-blueprints/tree/main/examples) to support my PR - [ ] Yes, I have created another PR for add-ons under [add-ons](https://github.com/aws-samples/eks-blueprints-add-ons) repo (if applicable) -- [ ] Yes, I have updated the [docs](https://github.com/aws-ia/terraform-aws-eks-blueprints/tree/main/docs) for this feature +- [ ] Yes, I have updated the [docs](https://github.com/aws-observability/terraform-aws-eks-blueprints/tree/main/docs) for this feature - [ ] Yes, I ran `pre-commit run -a` with this PR diff --git a/CODEOWNERS b/CODEOWNERS index d3e8e50..f7fc7b4 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,4 @@ # Require approvals from someone in the owner team before merging # More information here: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners -* @aws-ia/aws-observability-accelerator +* @aws-observability/aws-observability-accelerator diff --git a/README.md b/README.md index ff260ca..b214640 100644 --- a/README.md +++ b/README.md @@ -102,4 +102,4 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform ## License -Apache-2.0 Licensed. See [LICENSE](https://github.com/aws-ia/terraform-aws-eks-blueprints/blob/main/LICENSE). +Apache-2.0 Licensed. See [LICENSE](https://github.com/aws-observability/terraform-aws-eks-blueprints/blob/main/LICENSE). diff --git a/docs/index.md b/docs/index.md index 4d71ac8..00ffb82 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # AWS Observability Accelerator for Terraform -![GitHub](https://img.shields.io/github/license/aws-ia/terraform-aws-observability-accelerator) +![GitHub](https://img.shields.io/github/license/aws-observability/terraform-aws-observability-accelerator) Welcome to AWS Observability Accelerator for Terraform! diff --git a/examples/existing-cluster-with-base-and-infra/main.tf b/examples/existing-cluster-with-base-and-infra/main.tf index 90d9cd0..cd37640 100644 --- a/examples/existing-cluster-with-base-and-infra/main.tf +++ b/examples/existing-cluster-with-base-and-infra/main.tf @@ -42,13 +42,13 @@ locals { eks_cluster_version = data.aws_eks_cluster.this.version tags = { - Source = "github.com/aws-ia/terraform-aws-observability-accelerator" + Source = "github.com/aws-observability/terraform-aws-observability-accelerator" } } # deploys the base module module "eks_observability_accelerator" { - # source = "aws-ia/terrarom-aws-observability-accelerator" + # source = "aws-observability/terrarom-aws-observability-accelerator" source = "../../" aws_region = var.aws_region @@ -91,7 +91,7 @@ provider "grafana" { module "workloads_infra" { source = "../../modules/workloads/infra" - # source = "aws-ia/terrarom-aws-observability-accelerator/workloads/infra" + # source = "aws-observability/terrarom-aws-observability-accelerator/workloads/infra" eks_cluster_id = module.eks_observability_accelerator.eks_cluster_id diff --git a/modules/add-ons/adot-operator/README.md b/modules/add-ons/adot-operator/README.md index 70884c4..9e12cf4 100644 --- a/modules/add-ons/adot-operator/README.md +++ b/modules/add-ons/adot-operator/README.md @@ -41,7 +41,7 @@ the ADOT Operator. | Name | Source | Version | |------|--------|---------| -| [cert\_manager](#module\_cert\_manager) | github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/cert-manager | n/a | +| [cert\_manager](#module\_cert\_manager) | github.com/aws-observability/terraform-aws-eks-blueprints/modules/kubernetes-addons/cert-manager | n/a | ## Resources diff --git a/modules/add-ons/adot-operator/main.tf b/modules/add-ons/adot-operator/main.tf index e8723a8..be29d8f 100644 --- a/modules/add-ons/adot-operator/main.tf +++ b/modules/add-ons/adot-operator/main.tf @@ -1,5 +1,5 @@ module "cert_manager" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/cert-manager" + source = "github.com/aws-observability/terraform-aws-eks-blueprints/modules/kubernetes-addons/cert-manager" count = var.enable_cert_manager ? 1 : 0 helm_config = { version = "v1.8.2" } diff --git a/modules/workloads/infra/README.md b/modules/workloads/infra/README.md index 02afca0..1ffb82e 100644 --- a/modules/workloads/infra/README.md +++ b/modules/workloads/infra/README.md @@ -26,7 +26,7 @@ It provides the following resources: | Name | Source | Version | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon | n/a | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-observability/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon | n/a | ## Resources diff --git a/modules/workloads/infra/main.tf b/modules/workloads/infra/main.tf index da97bd8..417ebbd 100644 --- a/modules/workloads/infra/main.tf +++ b/modules/workloads/infra/main.tf @@ -44,7 +44,7 @@ resource "helm_release" "prometheus_node_exporter" { } module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon" + source = "github.com/aws-observability/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon" helm_config = merge( { diff --git a/modules/workloads/java/main.tf b/modules/workloads/java/main.tf index dfc135b..34de9f4 100644 --- a/modules/workloads/java/main.tf +++ b/modules/workloads/java/main.tf @@ -16,7 +16,7 @@ data "aws_partition" "current" {} # deploys collector module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon" + source = "github.com/aws-observability/terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon" helm_config = merge( diff --git a/tfsec.yaml b/tfsec.yaml index 73b3338..9fe2256 100644 --- a/tfsec.yaml +++ b/tfsec.yaml @@ -1,5 +1,5 @@ exclude: - - aws-iam-no-policy-wildcards # Wildcards required in addon IAM policies + - aws-observabilitym-no-policy-wildcards # Wildcards required in addon IAM policies - aws-vpc-no-excessive-port-access # VPC settings left up to user implementation for recommended practices - aws-vpc-no-public-ingress-acl # VPC settings left up to user implementation for recommended practices - aws-eks-no-public-cluster-access-to-cidr # Public access enabled for better example usability, users are recommended to disable if possible