diff --git a/.codecov.yml b/.codecov.yml index 4c8e33d..3bbdb50 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,6 +1,6 @@ -## SPDX-FileCopyrightText: 2020 Comcast Cable Communications Management, LLC -## SPDX-License-Identifier: Apache-2.0 - +# SPDX-FileCopyrightText: 2020 Comcast Cable Communications Management, LLC +# SPDX-License-Identifier: Apache-2.0 +--- coverage: range: 50..80 round: down diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2fb3c9e..8764f8b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,13 +7,14 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - # Check for updates to GitHub Actions every week + # Check for updates to GitHub Actions every day interval: "daily" labels: - "dependencies" commit-message: prefix: "chore" include: "scope" + open-pull-requests-limit: 10 - package-ecosystem: gomod directory: / @@ -22,5 +23,6 @@ updates: labels: - "dependencies" commit-message: - prefix: "feat" + prefix: "chore" include: "scope" + open-pull-requests-limit: 10 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17a2976..a273c11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ on: jobs: ci: - uses: xmidt-org/shared-go/.github/workflows/ci.yml@3bef4e75bb010c08cf96c3dee60f126a220b8073 # v4.3.2 + uses: xmidt-org/shared-go/.github/workflows/ci.yml@c36ac2ad09d830fd07a1994264400c8c50e10302 # v4.4.14 with: tests-skip: true release-type: program @@ -28,4 +28,5 @@ jobs: release-docker-latest: true release-docker-major: true release-docker-minor: true + yaml-lint-skip: false secrets: inherit diff --git a/.golangci.yaml b/.golangci.yaml index 864c369..7ffec7d 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -33,4 +33,4 @@ linters-settings: # Report non-wrapping error creation using fmt.Errorf errorf: false misspell: - locale: US \ No newline at end of file + locale: US diff --git a/.yamllint.yml b/.yamllint.yml new file mode 100644 index 0000000..c2053c9 --- /dev/null +++ b/.yamllint.yml @@ -0,0 +1,37 @@ +# SPDX-FileCopyrightText: 2024 Comcast Cable Communications Management, LLC +# SPDX-License-Identifier: Apache-2.0 +--- + +extends: default + +ignore: [] + +rules: + braces: + level: warning + max-spaces-inside: 1 + brackets: + level: warning + max-spaces-inside: 1 + colons: + level: warning + max-spaces-after: -1 + commas: + level: warning + comments: disable + comments-indentation: disable + document-start: + present: true + empty-lines: + max: 2 + hyphens: + max-spaces-after: 1 + indentation: + level: error + indent-sequences: consistent + line-length: + level: warning + max: 90 + allow-non-breakable-words: true + allow-non-breakable-inline-mappings: true + truthy: disable diff --git a/conf/caduceator.yaml b/conf/caduceator.yaml index 5ab8a18..f958a6f 120000 --- a/conf/caduceator.yaml +++ b/conf/caduceator.yaml @@ -1 +1 @@ -caduceator.yaml \ No newline at end of file +../caduceator.yaml \ No newline at end of file diff --git a/deploy/docker-compose/docFiles/caduceator.yaml b/deploy/docker-compose/docFiles/caduceator.yaml index ea969c8..f7499bb 100644 --- a/deploy/docker-compose/docFiles/caduceator.yaml +++ b/deploy/docker-compose/docFiles/caduceator.yaml @@ -1,5 +1,5 @@ -## SPDX-FileCopyrightText: 2020 Comcast Cable Communications Management, LLC -## SPDX-License-Identifier: Apache-2.0 +# SPDX-FileCopyrightText: 2020 Comcast Cable Communications Management, LLC +# SPDX-License-Identifier: Apache-2.0 --- server: "caduceator-instance-123.example.com" diff --git a/deploy/docker-compose/docFiles/prometheus.yml b/deploy/docker-compose/docFiles/prometheus.yml index c1fec3f..0fb961f 100644 --- a/deploy/docker-compose/docFiles/prometheus.yml +++ b/deploy/docker-compose/docFiles/prometheus.yml @@ -85,4 +85,4 @@ scrape_configs: # scheme defaults to 'http'. static_configs: - - targets: ['caduceator:5003'] \ No newline at end of file + - targets: ['caduceator:5003'] diff --git a/deploy/docker-compose/docFiles/tr1d1um.yaml b/deploy/docker-compose/docFiles/tr1d1um.yaml index 094380f..2522ba4 100644 --- a/deploy/docker-compose/docFiles/tr1d1um.yaml +++ b/deploy/docker-compose/docFiles/tr1d1um.yaml @@ -1,78 +1,78 @@ ## SPDX-FileCopyrightText: 2020 Comcast Cable Communications Management, LLC ## SPDX-License-Identifier: Apache-2.0 --- - fqdn: tr1d1um - env: test - scheme: http - hooksScheme: http +fqdn: tr1d1um +env: test +scheme: http +hooksScheme: http - primary: - address: ":6100" - health: - address: ":6101" - options: - - "PayloadsOverZero" - - "PayloadsOverHundred" - - "PayloadsOverThousand" - - "PayloadsOverTenThousand" - readTimeout: "15s" - idleTimeout: "15s" - pprof: - address: ":6102" - readTimeout: "15s" - idleTimeout: "15s" - metric: - address: ":6103" - metricsOptions: - namespace: "webpa" - subsystem: "tr1d1um" - readTimeout: "15s" - idleTimeout: "15s" - log: - file: "stdout" - level: "INFO" - json: false - - webhooksEnabled: false +primary: + address: ":6100" +health: + address: ":6101" + options: + - "PayloadsOverZero" + - "PayloadsOverHundred" + - "PayloadsOverThousand" + - "PayloadsOverTenThousand" + readTimeout: "15s" + idleTimeout: "15s" +pprof: + address: ":6102" + readTimeout: "15s" + idleTimeout: "15s" +metric: + address: ":6103" + metricsOptions: + namespace: "webpa" + subsystem: "tr1d1um" + readTimeout: "15s" + idleTimeout: "15s" +log: + file: "stdout" + level: "INFO" + json: false - start: - duration: 1 - apiPath: tr1d1um:6100/hooks +webhooksEnabled: false - waitForDns: 0 +start: + duration: 1 + apiPath: tr1d1um:6100/hooks - aws: - accessKey: "supbro" - secretKey: "nahbro" - env: local-dev - sns: - awsEndpoint: http://goaws:4100 - region: "us-east-1" - topicArn: arn:aws:sns:us-east-1:000000000000:xmidt-local-caduceus - urlPath: "/api/v2/aws/sns" +waitForDns: 0 - authHeader: ["dXNlcjpwYXNz"] +aws: + accessKey: "supbro" + secretKey: "nahbro" + env: local-dev + sns: + awsEndpoint: http://goaws:4100 + region: "us-east-1" + topicArn: arn:aws:sns:us-east-1:000000000000:xmidt-local-caduceus + urlPath: "/api/v2/aws/sns" - jwtValidator: - keys: - factory: - uri: "https://sat-prod.codebig2.net/keys/{keyId}" - purpose: 0 - updateInterval: 604800000000000 - capabilityCheck: - type: "monitor" - prefix: "x1:webpa:api:" - acceptAllMethod: "all" +authHeader: ["dXNlcjpwYXNz"] + +jwtValidator: + keys: + factory: + uri: "https://sat-prod.codebig2.net/keys/{keyId}" + purpose: 0 + updateInterval: 604800000000000 +capabilityCheck: + type: "monitor" + prefix: "x1:webpa:api:" + acceptAllMethod: "all" # type: "enforce" # prefix: "prefix Here" # acceptAllMethod: "all" - targetURL: http://scytale:6300 - # WRPSource: "dns:tr1d1um.xmidt.comcast.net" - supportedServices: - - "config" - clientTimeout: "135s" - respWaitTimeout: "129s" - netDialerTimeout: "5s" - requestRetryInterval: "2s" - requestMaxRetries: 2 +targetURL: http://scytale:6300 +# WRPSource: "dns:tr1d1um.xmidt.comcast.net" +supportedServices: + - "config" +clientTimeout: "135s" +respWaitTimeout: "129s" +netDialerTimeout: "5s" +requestRetryInterval: "2s" +requestMaxRetries: 2