Skip to content

refactor(orgadm): use token-exchange/store for API key management #88

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

Merged
robertodauria merged 1 commit into from
Jan 27, 2026
Merged

refactor(orgadm): use token-exchange/store for API key management #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 14 additions & 28 deletions cmd/orgadm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,31 @@
"flag"
"log"

apikeys "cloud.google.com/go/apikeys/apiv2"
"cloud.google.com/go/datastore"
secretmanager "cloud.google.com/go/secretmanager/apiv1"
"github.com/m-lab/autojoin/internal/adminx"
"github.com/m-lab/autojoin/internal/adminx/crmiface"
"github.com/m-lab/autojoin/internal/adminx/iamiface"
"github.com/m-lab/autojoin/internal/adminx/keysiface"
"github.com/m-lab/autojoin/internal/dnsname"
"github.com/m-lab/autojoin/internal/dnsx"
"github.com/m-lab/autojoin/internal/dnsx/dnsiface"
"github.com/m-lab/go/rtx"
"github.com/m-lab/token-exchange/store"
"google.golang.org/api/cloudresourcemanager/v1"
"google.golang.org/api/dns/v1"
iam "google.golang.org/api/iam/v1"
)

var (
org string
orgEmail string
project string
locateProject string
updateTables bool
org string
orgEmail string
project string
updateTables bool
)

func init() {
flag.StringVar(&org, "org", "", "Organization name. Must match name assigned by M-Lab")
flag.StringVar(&project, "project", "", "GCP project to create organization resources")
flag.StringVar(&locateProject, "locate-project", "", "GCP project for Locate API")
flag.BoolVar(&updateTables, "update-tables", false, "Allow this org's service account to update table schemas")
flag.StringVar(&orgEmail, "org-email", "", "Organization contact email")
}
Expand All @@ -55,7 +52,6 @@
crm, err := cloudresourcemanager.NewService(ctx)
rtx.Must(err, "failed to allocate new cloud resource manager client")
sa := adminx.NewServiceAccountsManager(iamiface.NewIAM(ic), nn)
rtx.Must(err, "failed to create sam")
sm := adminx.NewSecretManager(sc, nn, sa)
dnsService, err := dns.NewService(ctx)
rtx.Must(err, "failed to create new dns service")
Expand All @@ -66,30 +62,20 @@
rtx.Must(err, "failed to create datastore client")
defer dsc.Close()

// Initialize Datastore manager
ds := adminx.NewDatastoreManager(dsc, project)
// Initialize AutojoinManager from token-exchange with the correct namespace.
am := store.NewAutojoinManager(dsc, project, "platform-credentials")

ac, err := apikeys.NewClient(ctx)
rtx.Must(err, "failed to create new apikey client")
if project == "mlab-autojoin" && locateProject == "" {
locateProject = "mlab-ns"
}

// Local project names are taken from the namer.
k := adminx.NewAPIKeys(locateProject, keysiface.NewKeys(ac), nn)
defer ac.Close()

o := adminx.NewOrg(project, crmiface.NewCRM(project, crm), sa, sm, d, k, ds, updateTables)
o := adminx.NewOrg(project, crmiface.NewCRM(project, crm), sa, sm, d, am, updateTables)
err = o.Setup(ctx, org, orgEmail)
rtx.Must(err, "failed to set up new organization: "+org)

// Create API key for Locate/Heartbeat.
locateKey, err := k.CreateKey(ctx, org)
rtx.Must(err, "failed to create locate key")
// Generate and store API key for autojoin/heartbeat authentication.
apiKey, err := store.GenerateAPIKey()
rtx.Must(err, "failed to generate API key")

// Create API key for autojoin with the same value as the Locate key.
key, err := o.CreateAPIKeyWithValue(ctx, org, locateKey)
_, err = am.CreateAPIKeyWithValue(ctx, org, apiKey)
rtx.Must(err, "failed to create API key")

log.Println("Setup okay - org:", org)
log.Println("API_KEY:", key)
log.Println("API_KEY:", apiKey)
}
72 changes: 36 additions & 36 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,46 @@ require (
github.com/go-test/deep v1.1.1
github.com/golang-jwt/jwt/v4 v4.5.2
github.com/gomodule/redigo v1.9.3
github.com/googleapis/gax-go/v2 v2.15.0
github.com/googleapis/gax-go/v2 v2.16.0
github.com/m-lab/gcp-service-discovery v1.5.1
github.com/m-lab/go v0.1.76
github.com/m-lab/locate v0.18.0
github.com/m-lab/token-exchange v0.3.1
github.com/m-lab/uuid-annotator v0.5.10
github.com/oschwald/geoip2-golang v1.13.0
github.com/prometheus/client_golang v1.23.2
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
google.golang.org/api v0.247.0
google.golang.org/grpc v1.74.2
google.golang.org/api v0.260.0
google.golang.org/grpc v1.78.0
)

require (
cel.dev/expr v0.24.0 // indirect
cloud.google.com/go v0.121.6 // indirect
cloud.google.com/go/auth v0.16.4 // indirect
cloud.google.com/go v0.123.0 // indirect
cloud.google.com/go/auth v0.18.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/compute/metadata v0.8.0 // indirect
cloud.google.com/go/iam v1.5.2 // indirect
cloud.google.com/go/longrunning v0.6.7 // indirect
cloud.google.com/go/monitoring v1.24.2 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/iam v1.5.3 // indirect
cloud.google.com/go/longrunning v0.8.0 // indirect
cloud.google.com/go/monitoring v1.24.3 // indirect
cloud.google.com/go/storage v1.56.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
github.com/dchest/safefile v0.0.0-20151022103144-855e8d98f185 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 // indirect
github.com/m-lab/tcp-info v1.5.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand All @@ -57,27 +58,26 @@ require (
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
github.com/zeebo/errs v1.4.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.12.0 // indirect
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
google.golang.org/protobuf v1.36.8 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20260120221211-b8f7ae30c516 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
google.golang.org/protobuf v1.36.11 // indirect
)
Loading