Skip to content

Commit

Permalink
Merge pull request #4 from armor/feature/CSV-134
Browse files Browse the repository at this point in the history
CSV-134: Replace quantum with armor after migrating repository
Merged without review using owner permissions. This is not yet in use.
  • Loading branch information
straineanu authored Jun 17, 2024
2 parents f935746 + 86d641e commit e73ac95
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @quantum-sec/quantum-infrastructure-reviewers
* @armor/infrastructure-reviewers
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repos:
- id: terraform_fmt
- id: terraform_tflint
- id: terraform_tfsec
- repo: https://github.com/quantum-sec/pre-commit
- repo: https://github.com/armor/pre-commit
rev: 1.1.1
hooks:
- id: terraform-validate
21 changes: 0 additions & 21 deletions azure-pipelines.yml

This file was deleted.

4 changes: 2 additions & 2 deletions examples/aws-cloudtrail-organization/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ for [cloudtrail](https://aws.amazon.com/cloudtrail/) logs.
>
> running in our logging account with the aws account id: `123456789012`
>
> example: `terraform apply -var name=quantum-123 -var aws_account_ids='["123456789012", "234567890123", "345678901234"]'`
> example: `terraform apply -var name=armor-123 -var aws_account_ids='["123456789012", "234567890123", "345678901234"]'`
> **NOTE:** When applying `aws-org-cloudtrail` you will need to use values from the output of `aws-audit-cloudtrail-bucket`
> values: `s3_bucket_name`, `kms_key_arn`
Expand All @@ -25,7 +25,7 @@ for [cloudtrail](https://aws.amazon.com/cloudtrail/) logs.
>
> running in our organization management account with the aws account id: `234567890123`, pointing to s3 and kms in `123456789012`
>
> example: `terraform plan -var name=quantum-123 -var s3_bucket_name=cloudtrail-123456789012-example-quantum-123 -var kms_key_arn="arn:aws:kms:ap-southeast-1:123456789012:key/4b2f0c70-b503-4849-8286-34a6938c88a7"`
> example: `terraform plan -var name=armor-123 -var s3_bucket_name=cloudtrail-123456789012-example-armor-123 -var kms_key_arn="arn:aws:kms:ap-southeast-1:123456789012:key/4b2f0c70-b503-4849-8286-34a6938c88a7"`
In this example we are splitting the cloudtrail away from the S3 and CMK. This helps to ensure that we do not have production
workloads in our organization account. In addition to no production workloads in this account we can also provide very limited
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ locals {

default_tags = {
managed_by = "terraform"
module = "quantum-sec/package-aws-security/examples/aws-cloudtrail"
module = "armor/package-aws-security/examples/aws-cloudtrail"
}
tags = merge(local.default_tags, var.tags)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ variable "tags" {
department = "security_engineering"
team = "cloud_security"
stack = "security_events"
project = "quantum"
project = "armor"
service = "cloudtrail"
application = "sentinel"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ locals {

default_tags = {
managed_by = "terraform"
module = "quantum-sec/package-aws-security/examples/aws-cloudtrail"
module = "armor/package-aws-security/examples/aws-cloudtrail"
}
tags = merge(local.default_tags, var.tags)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ variable "tags" {
department = "security_engineering"
team = "cloud_security"
stack = "security_events"
project = "quantum"
project = "armor"
service = "cloudtrail"
application = "sentinel"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/aws-cloudtrail/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ locals {
worm_retention_days = var.worm_retention_days
default_tags = {
managed_by = "terraform"
module = "quantum-sec/package-aws-security/examples/aws-cloudtrail"
module = "armor/package-aws-security/examples/aws-cloudtrail"
}
tags = merge(local.default_tags, var.tags)

Expand Down
2 changes: 1 addition & 1 deletion examples/aws-cloudtrail/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ variable "tags" {
department = "security_engineering"
team = "cloud_security"
stack = "security_events"
project = "quantum"
project = "armor"
service = "cloudtrail"
application = "sentinel"
}
Expand Down
6 changes: 3 additions & 3 deletions modules/aws-guardduty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ terraform {
# ---------------------------------------------------------------------------------------------------------------------
module "guardduty" {
source = "git::[email protected]:quantum-sec/package-aws-security.git//modules/aws-guardduty?ref=2.0.1"
source = "git::[email protected]:armor/package-aws-security.git//modules/aws-guardduty?ref=1.0.0"
aws_account_id = "xxxxxxxxxxxx"
main_region = "ap-southeast-1"
Expand Down Expand Up @@ -129,7 +129,7 @@ terraform {
# ---------------------------------------------------------------------------------------------------------------------
module "guardduty" {
source = "git::[email protected]:quantum-sec/package-aws-security.git//modules/aws-guardduty?ref=2.0.1"
source = "git::[email protected]:armor/package-aws-security.git//modules/aws-guardduty?ref=1.0.0"
aws_account_id = "xxxxxxxxxxxx"
aws_region = "ap-southeast-1"
Expand Down Expand Up @@ -173,7 +173,7 @@ terraform {
# ---------------------------------------------------------------------------------------------------------------------
module "guardduty" {
source = "git::[email protected]:quantum-sec/package-aws-security.git//modules/aws-guardduty?ref=2.0.1"
source = "git::[email protected]:armor/package-aws-security.git//modules/aws-guardduty?ref=1.0.0"
aws_account_id = "xxxxxxxxxxxx"
aws_region = "ap-southeast-1"
Expand Down
2 changes: 1 addition & 1 deletion modules/aws-iam-service-account/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ variable "name" {
variable "path" {
description = "The path in which to create the service account."
type = string
default = "/quantum-service-accounts/"
default = "/armor-service-accounts/"
}
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@quantum-sec/package-aws-security",
"name": "@armor/package-aws-security",
"version": "0.0.0-development",
"private": true,
"description": "Contains modules for deploying and managing security resources in AWS.",
"repository": {
"type": "git",
"url": "[email protected]:quantum-sec/package-aws-security.git"
"url": "[email protected]:armor/package-aws-security.git"
},
"author": "Quantum Security Pte. Ltd.",
"author": "Armor Defense, Inc.",
"license": "SEE LICENSE IN LICENSE"
}
4 changes: 2 additions & 2 deletions test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ themselves. Therefore, we set a timeout of 45 minutes to make sure all tests hav
### Prerequisites

- [Install Go](https://golang.org/)
- [Install Terraform](https://github.com/quantum-sec/meta/tree/master/setup/terragrunt)
- [Login to the AWS CLI](https://github.com/quantum-sec/infrastructure-live-customer/blob/master/.tools/aws/aws-cli-login.sh)
- [Install Terraform](https://github.com/armor/meta/blob/master/setup/terragrunt/)
- [Login to the AWS CLI](https://github.com/armor/awscli-login/)

### Run All of the Tests

Expand Down
2 changes: 1 addition & 1 deletion test/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/quantum-sec/package-aws-security
module github.com/armor/package-aws-security

go 1.15

Expand Down

0 comments on commit e73ac95

Please sign in to comment.