Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor make for atrium #904

Merged
merged 17 commits into from
Jan 22, 2024
Merged

Refactor make for atrium #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b84932b
Updating cloud setup. Beginning of local setup.
Jan 13, 2024
d97023e
Adding git ignore.
Jan 13, 2024
df6c7e5
Adding ignore for generated resources directory as well.
Jan 13, 2024
48a9609
Add a few more steps to make it possible to run vault as a service lo…
Jan 13, 2024
fdf9913
Merge pull request #1 from mrjrieke/install_setup
mrjrieke Jan 13, 2024
efe50e7
Improve instructions for local token setup.
Jan 17, 2024
5c1dc9c
Merge branch 'trimble-oss:main' into main
mrjrieke Jan 17, 2024
e7587e9
Merge pull request #2 from mrjrieke/token_setup
mrjrieke Jan 17, 2024
ca2a458
Adding reboot instructions.
Jan 18, 2024
189214e
Fix the post installation instructions.
Jan 18, 2024
2e5209f
Merge branch 'trimble-oss:main' into main
mrjrieke Jan 18, 2024
0746e0a
Merge branch 'trimble-oss:main' into main
mrjrieke Jan 19, 2024
edbf9fd
Adding more explicit steps for installing vault.
Jan 19, 2024
64a92d5
Add a confirmation check.
Jan 19, 2024
5b3340f
Merge branch 'main' of github.com:mrjrieke/tierceron
Jan 22, 2024
9abdea5
Refactor for atrium make build support.
Jan 22, 2024
53dbd12
Merge pull request #3 from mrjrieke/refactor_make
mrjrieke Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 1 addition & 34 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,6 @@ api:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go install github.com/trimble-oss/tierceron/trcweb/apiRouter
config:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go install -tags "azure memonly" github.com/trimble-oss/tierceron/cmd/trcconfig

devplugincarrierbuild:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags "insecure azrcr" -o plugins/deploy/target/trc-vault-carrier-plugin github.com/trimble-oss/tierceron/atrium/vestibulum/plugins/carrier
devplugincarriersha:
sha256sum plugins/deploy/target/trc-vault-carrier-plugin | cut -d' ' -f1 > plugins/deploy/target/trc-vault-carrier-plugin.sha256
devplugincarrier: devplugincarrierbuild devplugincarriersha

devplugintrcdbbuild:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) CGO_ENABLED=0 go build -tags "insecure" -o plugins/deploy/target/trc-vault-plugin github.com/trimble-oss/tierceron/atrium/vestibulum/plugins/trcdb
devplugintrcdbsha:
sha256sum plugins/deploy/target/trc-vault-plugin | cut -d' ' -f1 > plugins/deploy/target/trc-vault-plugin.sha256
devplugintrcdb: devplugintrcdbbuild devplugintrcdbsha

harbingplugintrcdbbuild:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) CGO_ENABLED=0 go build -tags "insecure" -o plugins/deploy/target/trc-vault-plugin github.com/trimble-oss/tierceron/atrium/vestibulum/plugins/trcdb
harbingplugintrcdbsha:
sha256sum plugins/deploy/target/trc-vault-plugin | cut -d' ' -f1 > plugins/deploy/target/trc-vault-plugin.sha256
harbingplugintrcdb: harbingplugintrcdbbuild harbingplugintrcdbsha

configmac:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) GOOS=darwin GOARCH=amd64 go build -tags "azure" -o $(GOBIN)/trcconfig.mac github.com/trimble-oss/tierceron/cmd/trcconfig
seed:
Expand All @@ -49,23 +30,9 @@ pub:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go install -tags "azure memonly" github.com/trimble-oss/tierceron/cmd/trcpub
sub:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go install -tags "azure memonly" github.com/trimble-oss/tierceron/cmd/trcsub
certify:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/trcplgtool -tags "memonly azrcr" github.com/trimble-oss/tierceron/atrium/vestibulum/cmd/trcplgtool
trcshell:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/trcsh -tags "memonly" github.com/trimble-oss/tierceron/atrium/vestibulum/shell/trcsh
trcshellwin:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) GOOS=windows GOARCH=amd64 go build -tags "tc windows azrcr memonly" -o $(GOBIN)/trcsh.exe github.com/trimble-oss/tierceron/atrium/vestibulum/shell/trcsh

ctl:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go install -tags "memonly tc" github.com/trimble-oss/tierceron/cmd/trcctl

fenestra:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/fenestra -tags "insecure fyneboot argosystub tc" -ldflags="$(LD_FLAGS)" github.com/trimble-oss/tierceron/atrium/speculatio/fenestra

spiralis:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/spiralis -tags "insecure g3nboot argosystub tc" -ldflags="$(LD_FLAGS)" github.com/trimble-oss/tierceron/atrium/speculatio/spiralis

gen:
protoc --proto_path=. --twirp_out=. --go_out=. rpc/apinator/service.proto

all: api certify devplugintrcdb config seed x xlib pub sub
all: api config seed x xlib pub sub
36 changes: 36 additions & 0 deletions atrium/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
GOPATH=~/workspace/go:$(shell pwd)/vendor:$(shell pwd)
GOBIN=$(shell pwd)/bin
GOFILES=$(wildcard *.go)

devplugincarrierbuild:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags "insecure azrcr" -o plugins/deploy/target/trc-vault-carrier-plugin github.com/trimble-oss/tierceron/atrium/vestibulum/plugins/carrier
devplugincarriersha:
sha256sum plugins/deploy/target/trc-vault-carrier-plugin | cut -d' ' -f1 > plugins/deploy/target/trc-vault-carrier-plugin.sha256
devplugincarrier: devplugincarrierbuild devplugincarriersha

devplugintrcdbbuild:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) CGO_ENABLED=0 go build -tags "insecure" -o plugins/deploy/target/trc-vault-plugin github.com/trimble-oss/tierceron/atrium/vestibulum/plugins/trcdb
devplugintrcdbsha:
sha256sum plugins/deploy/target/trc-vault-plugin | cut -d' ' -f1 > plugins/deploy/target/trc-vault-plugin.sha256
devplugintrcdb: devplugintrcdbbuild devplugintrcdbsha

harbingplugintrcdbbuild:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) CGO_ENABLED=0 go build -tags "insecure" -o plugins/deploy/target/trc-vault-plugin github.com/trimble-oss/tierceron/atrium/vestibulum/plugins/trcdb
harbingplugintrcdbsha:
sha256sum plugins/deploy/target/trc-vault-plugin | cut -d' ' -f1 > plugins/deploy/target/trc-vault-plugin.sha256
harbingplugintrcdb: harbingplugintrcdbbuild harbingplugintrcdbsha

certify:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/trcplgtool -tags "memonly azrcr" github.com/trimble-oss/tierceron/atrium/vestibulum/cmd/trcplgtool
trcshell:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/trcsh -tags "memonly" github.com/trimble-oss/tierceron/atrium/vestibulum/shell/trcsh
trcshellwin:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) GOOS=windows GOARCH=amd64 go build -tags "tc windows azrcr memonly" -o $(GOBIN)/trcsh.exe github.com/trimble-oss/tierceron/atrium/vestibulum/shell/trcsh

fenestra:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/fenestra -tags "insecure fyneboot argosystub tc" -ldflags="$(LD_FLAGS)" github.com/trimble-oss/tierceron/atrium/speculatio/fenestra

spiralis:
@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go build -o $(GOBIN)/spiralis -tags "insecure g3nboot argosystub tc" -ldflags="$(LD_FLAGS)" github.com/trimble-oss/tierceron/atrium/speculatio/spiralis

all: certify devplugincarrier devplugintrcdb trcshell trcshellwin fenestra spiralis
6 changes: 4 additions & 2 deletions atrium/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/pavlo-v-chernykh/keystore-go/v4 v4.4.1
github.com/sendgrid/rest v2.6.9+incompatible
github.com/sendgrid/sendgrid-go v3.12.0+incompatible
github.com/trimble-oss/tierceron-hat v0.0.0-20231220141246-26dd2d238664
github.com/trimble-oss/tierceron-hat v0.0.0-20240105173112-8eae141c3201
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a

)
Expand All @@ -36,8 +36,10 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v2 v2.1.0
github.com/go-git/go-billy/v5 v5.4.1
github.com/graphql-go/graphql v0.8.1-0.20220614210743-09272f350067
github.com/trimble-oss/tierceron v1.1.0
github.com/trimble-oss/tierceron-nute v0.0.0-20231215170009-f41bd163ccda
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
Expand All @@ -50,7 +52,6 @@ require (

require (
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v2 v2.1.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
Expand All @@ -73,6 +74,7 @@ require (
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.1.0 // indirect
Expand Down
8 changes: 8 additions & 0 deletions atrium/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3q
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.0 h1:apA25AdhTvHEi9izOZFUm4NO1pJmHABncK673C/TZaY=
github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.0/go.mod h1:rL09sLEGjIG0TgfQZNMvJ9FtfAseOtBPbGD5eZQMCqw=
Expand All @@ -70,6 +71,7 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY=
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk=
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
Expand Down Expand Up @@ -295,6 +297,8 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 h1:+eHOFJl1BaXrQxKX+T06f78590z4qA2ZzBTqahsKSE4=
Expand Down Expand Up @@ -848,8 +852,12 @@ github.com/trimble-oss/go-mysql-server v0.12.0-1.12 h1:J9AY0+pgdwiAScHH4Ggb7aNy7
github.com/trimble-oss/go-mysql-server v0.12.0-1.12/go.mod h1:BWcyVjTqYp/wL9LYTRJ341vcOaJDaDRPldmyay0CbmU=
github.com/trimble-oss/kubectl v0.0.5 h1:8faeUC0kYp4vvY7cbymrOehUm2bj74JU+s330CTJ3Pw=
github.com/trimble-oss/kubectl v0.0.5/go.mod h1:V+ivAn0PvtBhgnjiBq1rk9EcijMNmAbD+Bc4SrMFP50=
github.com/trimble-oss/tierceron v1.1.0 h1:WW90bs/SGIZHCTk4z3vxZkMP7ECEyTxkpV8x8yUiELQ=
github.com/trimble-oss/tierceron v1.1.0/go.mod h1:6vAp1XYtrhlsxd5Txi/q4vTrZHrNciYIdJHE59xmKbI=
github.com/trimble-oss/tierceron-hat v0.0.0-20231220141246-26dd2d238664 h1:tuGB5oDRXAske3tMxfya3p7hc8A2xFKu0lmTBE33wy8=
github.com/trimble-oss/tierceron-hat v0.0.0-20231220141246-26dd2d238664/go.mod h1:tGBWlLEwe9A9JvWYqMkC9cHeWWqF0RWJ7wVtijuK8hE=
github.com/trimble-oss/tierceron-hat v0.0.0-20240105173112-8eae141c3201 h1:xLt/EBeNef/nd3HitiWthEryOZeRRMGrtPoDT3GluMo=
github.com/trimble-oss/tierceron-hat v0.0.0-20240105173112-8eae141c3201/go.mod h1:tGBWlLEwe9A9JvWYqMkC9cHeWWqF0RWJ7wVtijuK8hE=
github.com/trimble-oss/tierceron-nute v0.0.0-20231215170009-f41bd163ccda h1:aDN/07KBM+aqxqt+5Ty3rbXZyNVT4+P1va0/wb8ByKg=
github.com/trimble-oss/tierceron-nute v0.0.0-20231215170009-f41bd163ccda/go.mod h1:9d0O4NDikXUlHTTOMjIOONJ9JRqgI0c4BdD6icPtVBA=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
Expand Down