From 0cf7f36f17459109212e4fd6835cb8d026e3d1c5 Mon Sep 17 00:00:00 2001 From: James Wells Date: Thu, 3 Jun 2021 16:15:26 -0700 Subject: [PATCH] fix: [CI SKIP] Converting various files to the same basic format. --- .drone.yml | 116 +++++++++--------- src/picol/parser.go | 3 - .../main.go => picol_unused/main.go_unused} | 0 tfenv/_provider.tf | 8 +- tfenv/cluster/subnets.tf | 52 ++++---- tfenv/cluster/variables.tf | 14 +-- tfenv/cluster/vpc.tf | 30 ++--- tfenv/main.tf | 24 ++-- tfenv/terraform.tf | 14 +-- 9 files changed, 129 insertions(+), 132 deletions(-) rename src/picol/{picol/main.go => picol_unused/main.go_unused} (100%) diff --git a/.drone.yml b/.drone.yml index 1e385de..b2c8e6d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,78 +4,78 @@ type: docker name: validation platform: - arch: amd64 + arch: amd64 clone: - depth: 1 + depth: 1 volumes: - - name: dockersock - host: - path: /run/docker.sock + - name: dockersock + host: + path: /run/docker.sock steps: - - name: Notify Datadog That We Are Starting - image: masci/drone-datadog - settings: - api_key: - from_secret: Datadog - events: - - title: "Begin Build: ${DRONE_REPO}" - text: "Build ${DRONE_BUILD_NUMBER}(${DRONE_COMMIT_LINK})" - alert_type: "info" + - name: Notify Datadog That We Are Starting + image: masci/drone-datadog + settings: + api_key: + from_secret: Datadog + events: + - title: "Begin Build: ${DRONE_REPO}" + text: "Build ${DRONE_BUILD_NUMBER}(${DRONE_COMMIT_LINK})" + alert_type: "info" - - name: Validate code base and dependencies - image: dragonheim/golang:1.16.4 - volumes: - - name: dockersock - path: /var/run/docker.sock - environment: - TRIVY_QUIET: true - TRIVY_LIGHT: true - TRIVY_FORMAT: table - TRIVY_IGNORE_UNFIXED: true - TRIVY_NO_PROGRESS: true - commands: - ### Populate temporary container with tools / files we will need for building and testing - - apk add --no-cache zeromq-dev zeromq - # - curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.18.2 + - name: Validate code base and dependencies + image: dragonheim/golang:1.16.4 + volumes: + - name: dockersock + path: /var/run/docker.sock + environment: + TRIVY_QUIET: true + TRIVY_LIGHT: true + TRIVY_FORMAT: table + TRIVY_IGNORE_UNFIXED: true + TRIVY_NO_PROGRESS: true + commands: + ### Populate temporary container with tools / files we will need for building and testing + - apk add --no-cache zeromq-dev zeromq + # - curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.18.2 - ### Format the go code. Go does not care about it, but it helps to ensure everything is formated the same. - - go fmt ./... + ### Format the go code. Go does not care about it, but it helps to ensure everything is formated the same. + - go fmt ./... - ### Perform a basic lint of the code, we do this after formatting, just in case there are edge cases with the formatting. - - go vet ./... + ### Perform a basic lint of the code, we do this after formatting, just in case there are edge cases with the formatting. + - go vet ./... - ### Run a security check and warn us about lower level vulnerabilities - - trivy fs --exit-code 0 --severity UNKNOWN,LOW,MEDIUM . + ### Run a security check and warn us about lower level vulnerabilities + - trivy fs --exit-code 0 --severity UNKNOWN,LOW,MEDIUM . - ### Re-run the scan, but this time looking for higher level vulnerabilities that we want to block for. - - trivy fs --skip-update --exit-code 1 --severity CRITICAL,HIGH . + ### Re-run the scan, but this time looking for higher level vulnerabilities that we want to block for. + - trivy fs --skip-update --exit-code 1 --severity CRITICAL,HIGH . - ### Perform unit tests - # - @TODO I really don't know how to do unit tests. Will need to figure this out eventually. + ### Perform unit tests + # - @TODO I really don't know how to do unit tests. Will need to figure this out eventually. - ### Build test container. - # - docker buildx build --platform linux/arm/v7,linux/amd64,linux/arm64 --progress plain -t ${DRONE_REPO}:${DRONE_COMMIT} -f docker/Dockerfile . - - docker buildx build --platform linux/amd64 --progress plain -t ${DRONE_REPO}:${DRONE_COMMIT} -f docker/Dockerfile . + ### Build test container. + # - docker buildx build --platform linux/arm/v7,linux/amd64,linux/arm64 --progress plain -t ${DRONE_REPO}:${DRONE_COMMIT} -f docker/Dockerfile . + - docker buildx build --platform linux/amd64 --progress plain -t ${DRONE_REPO}:${DRONE_COMMIT} -f docker/Dockerfile . - ### Run a security check and warn us about lower level vulnerabilities - - trivy image --skip-update --exit-code 0 --severity UNKNOWN,LOW,MEDIUM,HIGH ${DRONE_REPO}:${DRONE_COMMIT} + ### Run a security check and warn us about lower level vulnerabilities + - trivy image --skip-update --exit-code 0 --severity UNKNOWN,LOW,MEDIUM,HIGH ${DRONE_REPO}:${DRONE_COMMIT} - ### Re-run the scan, but this time looking for critical vulnerabilities that we want to block for. - - trivy image --skip-update --exit-code 1 --severity CRITICAL ${DRONE_REPO}:${DRONE_COMMIT} + ### Re-run the scan, but this time looking for critical vulnerabilities that we want to block for. + - trivy image --skip-update --exit-code 1 --severity CRITICAL ${DRONE_REPO}:${DRONE_COMMIT} - - name: Notify Datadog That We Have Completed - image: masci/drone-datadog - settings: - api_key: - from_secret: Datadog - events: - - title: "Build failure on amd64" - text: "Build ${DRONE_BUILD_NUMBER}" - alert_type: "error" - when: - status: - - failure \ No newline at end of file + - name: Notify Datadog That We Have Completed + image: masci/drone-datadog + settings: + api_key: + from_secret: Datadog + events: + - title: "Build failure on amd64" + text: "Build ${DRONE_BUILD_NUMBER}" + alert_type: "error" + when: + status: + - failure diff --git a/src/picol/parser.go b/src/picol/parser.go index 4b55a95..65d9003 100644 --- a/src/picol/parser.go +++ b/src/picol/parser.go @@ -5,9 +5,6 @@ import ( "unicode/utf8" ) -/* - * ptESC is @TODO - */ const ( ptESC = iota ptSTR diff --git a/src/picol/picol/main.go b/src/picol/picol_unused/main.go_unused similarity index 100% rename from src/picol/picol/main.go rename to src/picol/picol_unused/main.go_unused diff --git a/tfenv/_provider.tf b/tfenv/_provider.tf index 1991988..601b031 100644 --- a/tfenv/_provider.tf +++ b/tfenv/_provider.tf @@ -1,9 +1,9 @@ provider "aws" { - alias = "us-west-2" - region = "us-west-2" + alias = "us-west-2" + region = "us-west-2" } provider "aws" { - alias = "us-east-1" - region = "us-east-1" + alias = "us-east-1" + region = "us-east-1" } diff --git a/tfenv/cluster/subnets.tf b/tfenv/cluster/subnets.tf index 4bd677f..494dda1 100644 --- a/tfenv/cluster/subnets.tf +++ b/tfenv/cluster/subnets.tf @@ -1,38 +1,38 @@ # variable "vpc_id" {} data "aws_vpc" "selected" { - id = var.vpc_id + id = var.vpc_id } variable "regional_cidr_blocks" { - description = "A simple map of subnets used by region" - type = map - default = { - "us-west-2a-private" = "10.172.64.0/23", - "us-west-2b-private" = "10.172.66.0/23", - "us-west-2a-public" = "10.172.68.0/26", - "us-west-2b-public" = "10.172.68.64/26", - "us-east-1a-private" = "10.172.0.0/23", - "us-east-1b-private" = "10.172.2.0/23", - "us-east-1a-public" = "10.172.4.0/26", - "us-east-1b-public" = "10.172.4.64/26" - } + description = "A simple map of subnets used by region" + type = map + default = { + "us-west-2a-private" = "10.172.64.0/23", + "us-west-2b-private" = "10.172.66.0/23", + "us-west-2a-public" = "10.172.68.0/26", + "us-west-2b-public" = "10.172.68.64/26", + "us-east-1a-private" = "10.172.0.0/23", + "us-east-1b-private" = "10.172.2.0/23", + "us-east-1a-public" = "10.172.4.0/26", + "us-east-1b-public" = "10.172.4.64/26" + } } resource "aws_subnet" "aza-private" { - depends_on = [data.aws_vpc.selected] - vpc_id = data.aws_vpc.id - availability_zone = format("%sa", var.region) - cidr_block = var.regional_cidr_blocks[ - format("%sa-private", var.region) - ] - tags = merge( - var.extra_tags, - { - Name = "aza-private" - tier = "private" - } - ) + depends_on = [data.aws_vpc.selected] + vpc_id = data.aws_vpc.id + availability_zone = format("%sa", var.region) + cidr_block = var.regional_cidr_blocks[ + format("%sa-private", var.region) + ] + tags = merge( + var.extra_tags, + { + Name = "aza-private" + tier = "private" + } + ) } # resource "aws_subnet" "aza-public" { diff --git a/tfenv/cluster/variables.tf b/tfenv/cluster/variables.tf index 37f2ce0..a238d8b 100644 --- a/tfenv/cluster/variables.tf +++ b/tfenv/cluster/variables.tf @@ -1,9 +1,9 @@ variable "extra_tags" { - description = "Tags required on all resources" - type = map - default = { - "org" = "dragonheim" - "service" = "gagent" - "maintained_by" = "jwells@dragonheim.net" - } + description = "Tags required on all resources" + type = map + default = { + "org" = "dragonheim" + "service" = "gagent" + "maintained_by" = "jwells@dragonheim.net" + } } diff --git a/tfenv/cluster/vpc.tf b/tfenv/cluster/vpc.tf index 4f6bddc..5e7f10a 100644 --- a/tfenv/cluster/vpc.tf +++ b/tfenv/cluster/vpc.tf @@ -2,22 +2,22 @@ variable "region" {} variable "provider_alias" {} variable "regional_vpc_cidr" { - description = "A simple map of VPC subnets used by region" - type = map - default = { - "us-west-2" = "10.172.64.0/19", - "us-east-1" = "10.172.0.0/19", - } + description = "A simple map of VPC subnets used by region" + type = map + default = { + "us-west-2" = "10.172.64.0/19", + "us-east-1" = "10.172.0.0/19", + } } resource "aws_vpc" "gagent" { - instance_tenancy = "default" - enable_dns_support = true - cidr_block = var.regional_vpc_cidr[var.region] - tags = merge( - var.extra_tags, - { - Name = "gagent" - } - ) + instance_tenancy = "default" + enable_dns_support = true + cidr_block = var.regional_vpc_cidr[var.region] + tags = merge( + var.extra_tags, + { + Name = "gagent" + } + ) } diff --git a/tfenv/main.tf b/tfenv/main.tf index 59d23c3..6549e0b 100644 --- a/tfenv/main.tf +++ b/tfenv/main.tf @@ -1,18 +1,18 @@ # main.tf module "us-east-1" { - source = "./cluster" - region = "us-east-1" - provider_alias = us-west-2 - providers = { - aws = "aws.us-east-1" - } + source = "./cluster" + region = "us-east-1" + provider_alias = us-west-2 + providers = { + aws = "aws.us-east-1" + } } module "us-west-2" { - source = "./cluster" - region = "us-west-2" - provider_alias = us-west-2 - providers = { - aws = "aws.us-west-2" - } + source = "./cluster" + region = "us-west-2" + provider_alias = us-west-2 + providers = { + aws = "aws.us-west-2" + } } diff --git a/tfenv/terraform.tf b/tfenv/terraform.tf index 997430a..7575a59 100644 --- a/tfenv/terraform.tf +++ b/tfenv/terraform.tf @@ -1,9 +1,9 @@ terraform { - required_version = ">= 0.15.3" - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 3.42.0" - } - } + required_version = ">= 0.15.3" + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 3.42.0" + } + } }