Implement granting and revoking of user roles (#4)

* Update dependencies * Fix issues after update * Implement granting and revoking user roles * remove provisioning flags from readme, fix title caser issue * Update makefile * Update notice file * Fix the build script in makefile --------- Co-authored-by: Marina Jakčin <marina.jakcin@applifting.cz>
ConductorOne · Aug 28, 2023 · 7703720 · 7703720
1 parent 4678b40
commit 7703720
Show file tree

Hide file tree

Showing 1,331 changed files with 349,248 additions and 133,958 deletions.
diff --git a/Makefile b/Makefile
@@ -1,13 +1,16 @@
 GOOS = $(shell go env GOOS)
 GOARCH = $(shell go env GOARCH)
 BUILD_DIR = dist/${GOOS}_${GOARCH}
+
+ifeq ($(GOOS),windows)
+OUTPUT_PATH = ${BUILD_DIR}/baton-cloudamqp.exe
+else
 OUTPUT_PATH = ${BUILD_DIR}/baton-cloudamqp
+endif
 
 .PHONY: build
 build:
- rm -f ${OUTPUT_PATH}
- mkdir -p ${BUILD_DIR}
- go build -o ${OUTPUT_PATH} cmd/baton-cloudamqp/*.go
+ go build -o ${OUTPUT_PATH} ./cmd/baton-cloudamqp
 
 .PHONY: update-deps
 update-deps:

diff --git a/NOTICE b/NOTICE
@@ -1,13 +1,4 @@
-Copyright 2023 ConductorOne Inc.
+baton
+Copyright 2023 ConductorOne, Inc.
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+This product includes software developed by ConductorOne (https://www.conductorone.com/).
diff --git a/README.md b/README.md
@@ -69,13 +69,9 @@ Available Commands:
 
 Flags:
  -f, --file string The path to the c1z file to sync with ($BATON_FILE) (default "sync.c1z")
- --grant-entitlement string The entitlement to grant to the supplied principal ($BATON_GRANT_ENTITLEMENT)
- --grant-principal string The resource to grant the entitlement to ($BATON_GRANT_PRINCIPAL)
- --grant-principal-type string The resource type of the principal to grant the entitlement to ($BATON_GRANT_PRINCIPAL_TYPE)
  -h, --help help for baton-cloudamqp
  --log-format string The output format for logs: json, console ($BATON_LOG_FORMAT) (default "json")
  --log-level string The log level: debug, info, warn, error ($BATON_LOG_LEVEL) (default "info")
- --revoke-grant string The grant to revoke ($BATON_REVOKE_GRANT)
  --token string The CloudAMQP access token used to connect to the CloudAMQP API. ($BATON_TOKEN)
  -v, --version version for baton-cloudamqp
 

diff --git a/cmd/baton-cloudamqp/main.go b/cmd/baton-cloudamqp/main.go
@@ -8,7 +8,6 @@ import (
  "github.com/conductorone/baton-cloudamqp/pkg/connector"
  "github.com/conductorone/baton-sdk/pkg/cli"
  "github.com/conductorone/baton-sdk/pkg/connectorbuilder"
- "github.com/conductorone/baton-sdk/pkg/sdk"
  "github.com/conductorone/baton-sdk/pkg/types"
  "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
  "go.uber.org/zap"
@@ -20,7 +19,7 @@ func main() {
  ctx := context.Background()
 
  cfg := &config{}
- cmd, err := cli.NewCmd(ctx, "baton-cloudamqp", cfg, validateConfig, getConnector, run)
+ cmd, err := cli.NewCmd(ctx, "baton-cloudamqp", cfg, validateConfig, getConnector)
  if err != nil {
  fmt.Fprintln(os.Stderr, err.Error())
  os.Exit(1)
@@ -53,29 +52,3 @@ func getConnector(ctx context.Context, cfg *config) (types.ConnectorServer, erro
 
  return connector, nil
 }
-
-// run is where the process of syncing with the connector is implemented.
-func run(ctx context.Context, cfg *config) error {
- l := ctxzap.Extract(ctx)
-
- c, err := getConnector(ctx, cfg)
- if err != nil {
- l.Error("error creating connector", zap.Error(err))
- return err
- }
-
- r, err := sdk.NewConnectorRunner(ctx, c, cfg.C1zPath)
- if err != nil {
- l.Error("error creating connector runner", zap.Error(err))
- return err
- }
- defer r.Close()
-
- err = r.Run(ctx)
- if err != nil {
- l.Error("error running connector", zap.Error(err))
- return err
- }
-
- return nil
-}
diff --git a/go.mod b/go.mod
@@ -3,69 +3,85 @@ module github.com/conductorone/baton-cloudamqp
 go 1.19
 
 require (
- github.com/conductorone/baton-sdk v0.0.32
+ github.com/conductorone/baton-sdk v0.1.1
  github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
- github.com/spf13/cobra v1.6.1
- go.uber.org/zap v1.24.0
- golang.org/x/text v0.7.0
- google.golang.org/grpc v1.53.0
+ github.com/spf13/cobra v1.7.0
+ go.uber.org/zap v1.25.0
+ golang.org/x/text v0.12.0
+ google.golang.org/grpc v1.57.0
 )
 
 require (
- github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
- github.com/aws/aws-sdk-go-v2 v1.17.5 // indirect
- github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
- github.com/aws/aws-sdk-go-v2/config v1.18.14 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.14 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.23 // indirect
- github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.54 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.29 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.23 // indirect
- github.com/aws/aws-sdk-go-v2/internal/ini v1.3.30 // indirect
- github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.21 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.24 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.23 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.23 // indirect
- github.com/aws/aws-sdk-go-v2/service/s3 v1.30.4 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.3 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.3 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.18.4 // indirect
- github.com/aws/smithy-go v1.13.5 // indirect
+ github.com/aws/aws-sdk-go-v2 v1.20.1 // indirect
+ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 // indirect
+ github.com/aws/aws-sdk-go-v2/config v1.18.33 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.32 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.77 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.39 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/v4a v1.1.1 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.13 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.33 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.1 // indirect
+ github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 // indirect
+ github.com/aws/smithy-go v1.14.1 // indirect
+ github.com/benbjohnson/clock v1.3.5 // indirect
  github.com/doug-martin/goqu/v9 v9.18.0 // indirect
  github.com/dustin/go-humanize v1.0.1 // indirect
- github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect
+ github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
- github.com/glebarez/go-sqlite v1.20.3 // indirect
- github.com/golang/protobuf v1.5.2 // indirect
+ github.com/glebarez/go-sqlite v1.21.2 // indirect
+ github.com/go-jose/go-jose/v3 v3.0.0 // indirect
+ github.com/go-ole/go-ole v1.2.6 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
- github.com/klauspost/compress v1.15.15 // indirect
+ github.com/klauspost/compress v1.16.7 // indirect
+ github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
  github.com/magiconair/properties v1.8.7 // indirect
- github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-isatty v0.0.19 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
- github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.9 // indirect
+ github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
+ github.com/pquerna/xjwt v0.2.0 // indirect
  github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
  github.com/segmentio/ksuid v1.0.4 // indirect
- github.com/spf13/afero v1.9.3 // indirect
- github.com/spf13/cast v1.5.0 // indirect
+ github.com/shirou/gopsutil/v3 v3.23.7 // indirect
+ github.com/shoenig/go-m1cpu v0.1.6 // indirect
+ github.com/spf13/afero v1.9.5 // indirect
+ github.com/spf13/cast v1.5.1 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
- github.com/spf13/viper v1.15.0 // indirect
+ github.com/spf13/viper v1.16.0 // indirect
  github.com/subosito/gotenv v1.4.2 // indirect
- go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/multierr v1.9.0 // indirect
- go.uber.org/ratelimit v0.2.0 // indirect
- golang.org/x/net v0.7.0 // indirect
- golang.org/x/sys v0.5.0 // indirect
- google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 // indirect
- google.golang.org/protobuf v1.28.1 // indirect
+ github.com/tklauser/go-sysconf v0.3.12 // indirect
+ github.com/tklauser/numcpus v0.6.1 // indirect
+ github.com/yusufpapurcu/wmi v1.2.3 // indirect
+ go.uber.org/atomic v1.11.0 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
+ go.uber.org/ratelimit v0.3.0 // indirect
+ golang.org/x/crypto v0.12.0 // indirect
+ golang.org/x/net v0.14.0 // indirect
+ golang.org/x/oauth2 v0.11.0 // indirect
+ golang.org/x/sys v0.11.0 // indirect
+ golang.org/x/term v0.11.0 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
  gopkg.in/ini.v1 v1.67.0 // indirect
+ gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- modernc.org/libc v1.22.2 // indirect
- modernc.org/mathutil v1.5.0 // indirect
- modernc.org/memory v1.5.0 // indirect
- modernc.org/sqlite v1.20.4 // indirect
+ modernc.org/libc v1.24.1 // indirect
+ modernc.org/mathutil v1.6.0 // indirect
+ modernc.org/memory v1.6.0 // indirect
+ modernc.org/sqlite v1.25.0 // indirect
 )