Skip to content

Add --base-url flag for connector testability #19

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

Open
robert-chiniquy wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add --base-url flag for connector testability #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c459d8
Add --base-url flag for connector testability
robert-chiniquy Feb 8, 2026
28fc4b2
Hide base-url field from hosted UI
robert-chiniquy Feb 14, 2026
40488af
Add ExportTargetCLIOnly to base-url field
robert-chiniquy Feb 19, 2026
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
5 changes: 5 additions & 0 deletions cmd/baton-cloudflare-zero-trust/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@ var (
"email",
field.WithDescription("Cloudflare account email"),
)
baseURLField = field.StringField(
"base-url",
field.WithDescription("Override the Cloudflare API URL (for testing)"),
)
configurationFields = []field.SchemaField{
accountIdField,
apiKeyField,
apiTokenField,
emailField,
baseURLField,
}
fieldRelationships = []field.SchemaFieldRelationship{
field.FieldsAtLeastOneUsed(apiTokenField, apiKeyField),
Expand Down
1 change: 1 addition & 0 deletions cmd/baton-cloudflare-zero-trust/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func getConnector(ctx context.Context, cfg *viper.Viper) (types.ConnectorServer,
cfg.GetString(apiTokenField.FieldName),
cfg.GetString(apiKeyField.FieldName),
cfg.GetString(emailField.FieldName),
cfg.GetString(baseURLField.FieldName),
)
if err != nil {
l.Error("error creating connector", zap.Error(err))
Expand Down
12 changes: 9 additions & 3 deletions pkg/connector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,23 @@ func (d *Connector) Validate(ctx context.Context) (annotations.Annotations, erro
}

// New returns a new instance of the connector.
func New(ctx context.Context, accountId, apiToken, apiKey, email string) (*Connector, error) {
func New(ctx context.Context, accountId, apiToken, apiKey, email, baseURL string) (*Connector, error) {
var (
client *cloudflare.API
err error
)

var opts []cloudflare.Option
if baseURL != "" {
opts = append(opts, cloudflare.BaseURL(baseURL))
}

if apiKey != "" && email != "" {
client, err = cloudflare.New(apiKey, email)
client, err = cloudflare.New(apiKey, email, opts...)
}

if apiToken != "" {
client, err = cloudflare.NewWithAPIToken(apiToken)
client, err = cloudflare.NewWithAPIToken(apiToken, opts...)
}

if err != nil {
Expand Down
Loading