Merge branch 'main' of https://github.com/opszero/template-infra

opszero · Apr 18, 2024 · 69a4935 · 69a4935
2 parents f9c6af8 + ae54585
commit 69a4935
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 26 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -10,4 +10,4 @@ github: [abhiyerra]
 # issuehunt: # Replace with a single IssueHunt username
 # otechie: # Replace with a single Otechie username
 # lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: ["https://www.opszero.com/devops"]
+custom: ["https://www.opszero.com"]
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,23 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "terraform"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -7,11 +7,8 @@ Ensure the following tasks are completed.
 - [ ] Is dependencies added with `poetry add`?
 - [ ] Is the README.md updated?
 - [ ] Are tests included?
-- [ ] Are the tests running?
+  - [ ] Are the tests running?
 - [ ] Are the names of the files correct?
-- [ ] Are migrations included? `make makemigrations && make migrate`
-- [ ] Does `make up` work?
-- [ ] Does `helm template show ./charts/opszero` work?
 - [ ] Add PR/Issue to opsZero Project and set to `Review` column
 
 # Reviewer Checklist
@@ -22,4 +19,4 @@ Ensure the following tasks are completed.
 
 - [ ] Is the marketing landing page updated?
 - [ ] Is the sales proposal updated?
-- [ ] Is the documentation updated?
+- [ ] Is the documentation updated
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -8,6 +8,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: hashicorp/setup-terraform@v2
-    - uses: pre-commit/action@v3.0.0
+    - uses: actions/checkout@v4
+    - uses: hashicorp/setup-terraform@v3
+    - uses: pre-commit/action@v3.0.1
diff --git a/LICENSE b/LICENSE
@@ -1,11 +1,9 @@
-MIT License
-
-Copyright(c) 2023 opsZero, LLC
+Copyright (c) 2016-2024 opsZero, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
+of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
@@ -18,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/LICENSE_PRO b/LICENSE_PRO
@@ -0,0 +1,3 @@
+opsZero customers please contact sales@opszero.com to get a copy of your
+commercial license. If you would like a commercial license please also contact
+sales@opszero.com.
diff --git a/environments/common/artifacts/main.tf b/environments/common/artifacts/main.tf
@@ -0,0 +1,27 @@
+provider "aws" {
+  profile = "<profile>"
+  region  = "us-west-2"
+}
+
+# terraform {
+#   backend "s3" {
+#     bucket  = "opszero-<profile>-terraform-tfstate"
+#     region  = "us-east-1"
+#     profile = "<profile>"
+#     encrypt = "true"
+
+#     key = "artifacts"
+#   }
+# }
+
+locals {
+  repo_names = [
+    "reponame",
+  ]
+}
+
+module "ecr" {
+  for_each = toset(local.repo_names)
+  source   = "github.com/opszero/terraform-aws-ecr"
+  name     = each.key
+}
diff --git a/environments/shared/iam/main.tf b/environments/shared/iam/main.tf
@@ -3,16 +3,16 @@ provider "aws" {
   region  = "us-west-2"
 }
 
-terraform {
-  backend "s3" {
-    bucket  = "opszero-<profile>-terraform-tfstate"
-    region  = "us-east-1"
-    profile = "<profile>"
-    encrypt = "true"
+# terraform {
+#   backend "s3" {
+#     bucket  = "opszero-<profile>-terraform-tfstate"
+#     region  = "us-east-1"
+#     profile = "<profile>"
+#     encrypt = "true"
 
-    key = "iam"
-  }
-}
+#     key = "iam"
+#   }
+# }
 
 resource "aws_iam_policy" "deployer" {
   name        = "github-deployer-policy"
@@ -49,9 +49,11 @@ module "users" {
   github = {
     "deployer" = {
       repos = [
-        "org/repo-name",
+        "opszero/terraform-aws-mrmgr"
+      ]
+      policy_arns = [
+        aws_iam_policy.deployer.arn
       ]
-      policy_arns = [aws_iam_policy.deployer.arn]
     }
   }