Skip to content

Commit 3b66e23

Browse files
fix: update logfmt to pass OpsLevel Platinum level (#10)
1 parent e58aa18 commit 3b66e23

27 files changed

+477
-505
lines changed

.circleci/config.yml

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# syntax, such as anchors, will be fixed automatically.
33
version: 2.1
44
orbs:
5-
shared: getoutreach/shared@2.2.0
5+
shared: getoutreach/shared@2.5.1
66

77
# Extra contexts to expose to all jobs below
88
contexts: &contexts
@@ -14,70 +14,72 @@ contexts: &contexts
1414
- opslevel-credentials
1515
- vault-dev
1616
- confluence
17-
###Block(extraContexts)
17+
- circleci-credentials
18+
## <<Stencil::Block(extraContexts)>>
1819

19-
###EndBlock(extraContexts)
20+
## <</Stencil::Block>>
21+
22+
# Branches used for releasing code, pre-release or not
23+
release_branches: &release_branches # Release branch
24+
- release
25+
# Pre-releases branch
26+
- "main"
2027

2128
jobs:
2229
{}
23-
###Block(circleJobs)
30+
## <<Stencil::Block(circleJobs)>>
2431

25-
###EndBlock(circleJobs)
32+
## <</Stencil::Block>>
2633

2734
### Start jobs inserted by other modules
2835
### End jobs inserted by other modules
2936

3037
workflows:
3138
version: 2
32-
###Block(circleWorkflows)
39+
## <<Stencil::Block(circleWorkflows)>>
3340

34-
###EndBlock(circleWorkflows)
41+
## <</Stencil::Block>>
3542

3643
### Start workflows inserted by other modules
3744
### End workflows inserted by other modules
3845

3946
release:
4047
jobs:
41-
###Block(circleWorkflowJobs)
48+
## <<Stencil::Block(circleWorkflowJobs)>>
4249

43-
###EndBlock(circleWorkflowJobs)
50+
## <</Stencil::Block>>
4451
### Start jobs inserted by other modules
4552
### End jobs inserted by other modules
4653
- shared/release: &release
4754
dryrun: false
4855
context: *contexts
49-
###Block(circleReleaseExtra)
56+
## <<Stencil::Block(circleReleaseExtra)>>
5057

51-
###EndBlock(circleReleaseExtra)
58+
## <</Stencil::Block>>
5259
requires:
53-
###Block(circleReleaseRequires)
60+
## <<Stencil::Block(circleReleaseRequires)>>
5461

55-
###EndBlock(circleReleaseRequires)
62+
## <</Stencil::Block>>
5663
- shared/test
5764
filters:
5865
branches:
59-
only:
60-
- master
61-
- main
62-
- release
63-
# Dryrun release for PRs
66+
only: *release_branches
67+
68+
# Dryrun release for PRs.
6469
- shared/release:
6570
<<: *release
6671
dryrun: true
6772
filters:
6873
branches:
69-
ignore:
70-
- master
71-
- main
72-
- release
74+
ignore: *release_branches
7375
- shared/test:
7476
context: *contexts
7577
app_name: logfmt
7678
### Start parameters inserted by other modules
7779
### End parameters inserted by other modules
78-
###Block(circleTestExtra)
80+
## <<Stencil::Block(circleTestExtra)>>
7981

80-
###EndBlock(circleTestExtra)
82+
## <</Stencil::Block>>
8183

8284
- shared/publish_docs:
8385
context: *contexts
@@ -86,23 +88,15 @@ workflows:
8688
ignore: /.*/
8789
tags:
8890
only: /v[0-9]+(\.[0-9]+)*(-.*)*/
89-
- shared/finalize-coverage:
90-
context: *contexts
91-
requires:
92-
- shared/e2e
93-
- shared/test
9491
- shared/e2e:
9592
context: *contexts
96-
###Block(circleE2EExtra)
93+
## <<Stencil::Block(circleE2EExtra)>>
9794

98-
###EndBlock(circleE2EExtra)
95+
## <</Stencil::Block>>
9996
- shared/docker:
10097
context: *contexts
10198
filters:
10299
branches:
103-
ignore:
104-
- master
105-
- main
106-
- release
100+
ignore: *release_branches
107101
tags:
108102
only: /v\d+(\.\d+)*(-.*)*/

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ indent_style = tab
1212
indent_style = space
1313
indent_size = 2
1414

15-
###Block(editorconfig)
15+
## <<Stencil::Block(editorconfig)>>
1616

17-
###EndBlock(editorconfig)
17+
## <</Stencil::Block>>

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# See https://help.github.com/articles/about-codeowners/
22
* @getoutreach/fnd-dt
33

4-
###Block(customCodeowners)
4+
## <<Stencil::Block(customCodeowners)>>
55

6-
###EndBlock(customCodeowners)
6+
## <</Stencil::Block>>

.github/dependabot.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
version: 2
22
updates:
3+
# Golang dependencies
34
- package-ecosystem: "gomod"
45
directory: "/"
56
schedule:
67
interval: "daily"
7-
# Bootstrap managed dependencies
8+
# stencil-golang managed dependencies
89
ignore:
910
- dependency-name: github.com/getoutreach/gobox
1011
- dependency-name: github.com/urfave/cli/v2
12+
- dependency-name: github.com/getoutreach/mint
13+
- dependency-name: github.com/getoutreach/httpx
14+
- dependency-name: github.com/getoutreach/services
15+
- dependency-name: github.com/getoutreach/datastores/v2
1116

1217
# Ignore semantic-release, this code is only executed in CI.
1318
- package-ecosystem: "npm"
@@ -17,5 +22,6 @@ updates:
1722
ignore:
1823
- dependency-name: "*"
1924

20-
###Block(dependabotPackageManagers)
21-
###EndBlock(dependabotPackageManagers)
25+
## <<Stencil::Block(dependabotPackageManagers)>>
26+
27+
## <</Stencil::Block>>

.github/pull_request_template.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
<!--
22
!!!! README !!!! Please fill this out.
33
4-
Please follow the PR naming conventions:
4+
Please follow the PR naming conventions:
55
https://outreach-io.atlassian.net/wiki/spaces/EN/pages/1902444645/Conventional+Commits
66
-->
77

8-
<!-- A short description of what your PR does and what it solves. -->
98

9+
<!-- A short description of what your PR does and what it solves. -->
1010
## What this PR does / why we need it
1111

12-
<!--- Block(jiraPrefix) --->
12+
13+
14+
<!-- <<Stencil::Block(jiraPrefix)>> -->
1315

1416
## Jira ID
1517

1618
[XX-XX]
1719

18-
<!--- EndBlock(jiraPrefix) --->
20+
<!-- <</Stencil::Block>> -->
1921

2022
<!-- Notes that may be helpful for anyone reviewing this PR -->
21-
2223
## Notes for your reviewers
2324

24-
<!--- Block(custom) -->
2525

26-
<!--- EndBlock(custom) -->
26+
27+
<!-- <<Stencil::Block(custom)>> -->
28+
29+
<!-- <</Stencil::Block>> -->

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ Pulumi.*.yaml
6060
# Documentation output
6161
/apidocs
6262

63-
###Block(extras)
63+
## <<Stencil::Block(extras)>>
6464

65-
###EndBlock(extras)
65+
## <</Stencil::Block>>

.prettierignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Ignore all markdown formatting by default. If you want prettier to format
2+
# your markdown files, manually include them by adding prefixed ! entries.
3+
*.md
4+
5+
## <<Stencil::Block(prettierignoreExtras)>>
6+
7+
## <</Stencil::Block>>

.releaserc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ plugins:
2424
- "dist/*.tar.gz"
2525
- "dist/checksums.txt"
2626

27-
### Block(customReleasePlugins)
27+
## <<Stencil::Block(customReleasePlugins)>>
2828

29-
### EndBlock(customReleasePlugins)
29+
## <</Stencil::Block>>

.tool-versions

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
# This file contains tool versions for use with asdf
2-
golang 1.17.9
2+
# Note: Versions in this block override the default versions below.
3+
# Be EXTREMELY CAREFUL with this. If you override a standard version
4+
# you are reducing compatibility guarantees.
5+
## <<Stencil::Block(toolverOverride)>>
6+
## <</Stencil::Block>>
7+
golang 1.19
38
nodejs 16.13.0
49
terraform 0.13.5
5-
ruby 2.6.6
6-
protoc 3.19.1
7-
# Note: Versions in this block override the above. Be EXTREMELY
8-
# CAREFUL with this. If you override a standard version you are
9-
# reducing compatibility guarantees.
10-
###Block(toolver)
11-
###EndBlock(toolver)
10+
ruby 2.7.5
11+
protoc 21.5
12+
# Note: Versions in this block do not override the default versions above
13+
# but sometimes you have to declare additional versions of the same tool
14+
# while leaving the 'default' version intact for the infra.
15+
# The most common case is nodejs.
16+
## <<Stencil::Block(toolver)>>
17+
## <</Stencil::Block>>

.vscode/extensions.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44
"esbenp.prettier-vscode",
55
"hashicorp.terraform",
66
"golang.go",
7-
"heptio.jsonnet",
8-
"xrc-inc.jsonnet-formatter",
7+
"Grafana.vscode-jsonnet",
98
"timonwong.shellcheck",
109
"zxh404.vscode-proto3",
1110
"redhat.vscode-yaml",
1211
"ms-azuretools.vscode-docker",
1312
"foxundermoon.shell-format"
1413

1514
// Please consider contributing back all recommended
16-
// extensions to bootstrap!
17-
///Block(extensions)
15+
// extensions to stencil!
16+
// <<Stencil::Block(extensions)>>
1817

19-
///EndBlock(extensions)
18+
// <</Stencil::Block>>
2019
]
2120
}

0 commit comments

Comments
 (0)