Skip to content

Commit

Permalink
Merge pull request #53 from ConductorOne/ggreer/upgrade
Browse files Browse the repository at this point in the history
Fix build and capability generation. Fix linter.
  • Loading branch information
ggreer authored Nov 26, 2024
2 parents fcf1ed2 + 124a2fe commit 26c9003
Show file tree
Hide file tree
Showing 28 changed files with 1,970 additions and 796 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/capabilities.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
run: go build -o connector ./cmd/baton-jira-datacenter

- name: Run and save output
env:
BATON_INSTANCE_URL: 'http://localhost:8080'
BATON_ACCESS_TOKEN: 'test'
run: ./connector capabilities > baton_capabilities.json

- name: Commit changes
Expand Down
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ linters:
- bodyclose # checks whether HTTP response body is closed successfully
- durationcheck # check for two durations multiplied together
- errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
- execinquery # execinquery is a linter about query string checker in Query function which reads your Go src files and warning it finds
- exhaustive # check exhaustiveness of enum switch statements
- exportloopref # checks for pointers to enclosing loop variables
- forbidigo # Forbids identifiers
Expand Down
2 changes: 1 addition & 1 deletion .gon-arm64.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"source": ["./dist/macos-arm64_darwin_arm64/baton-jira-datacenter"],
"source": ["./dist/macos-arm64_darwin_arm64_v8.0/baton-jira-datacenter"],
"bundle_id": "com.conductorone.baton-jira-datacenter",
"apple_id": {
"username" : "justin.gallardo@conductorone.com"
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ builds:
hooks:
post:
- gon .gon-arm64.json
- mv dist/baton-jira-datacenter-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64/baton-jira-datacenter
- mv dist/baton-jira-datacenter-darwin-arm64.signed.zip dist/macos-arm64_darwin_arm64_v8.0/baton-jira-datacenter
archives:
- id: linux-archive
builds:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/conductorone/baton-jira-datacenter
go 1.22.2

require (
github.com/conductorone/baton-sdk v0.2.43
github.com/conductorone/baton-sdk v0.2.46
github.com/conductorone/go-jira/v2 v2.0.0-20240808231011-dc00f11d2470
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
go.uber.org/zap v1.27.0
Expand Down
7 changes: 4 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/conductorone/baton-sdk v0.2.43 h1:7WdVF3OnAqbnNFqJ5PT//6EQqUa4B0JVr4K0F9JW7yg=
github.com/conductorone/baton-sdk v0.2.43/go.mod h1:hmd/Oz3DPIKD+9QmkusZaA18ZoiinnTDdrxh2skcdUc=
github.com/conductorone/baton-sdk v0.2.46 h1:yJnqu9E3VmXA7v+JMxzBDYb47ICy0wFYuGksi0693bI=
github.com/conductorone/baton-sdk v0.2.46/go.mod h1:CYyNk1kPIEgZmc3Z16TmpS1l3KbkNSjyJk16KuQw+JM=
github.com/conductorone/go-jira/v2 v2.0.0-20240808231011-dc00f11d2470 h1:Valo8acCYEfZp2neq+yi4wqqLh/CBU6UuxM13XQhpqo=
github.com/conductorone/go-jira/v2 v2.0.0-20240808231011-dc00f11d2470/go.mod h1:eMJODGFmHWC1egXOWdPaYfiACqNcHaS5Cnf1VMHVRBU=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
Expand Down Expand Up @@ -150,8 +150,9 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
Expand Down
Loading

0 comments on commit 26c9003

Please sign in to comment.