Skip to content

[WIP] Runtime config refactor #394

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

Draft
timothyF95 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] Runtime config refactor #394

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
2 changes: 2 additions & 0 deletions cmd/account/access/access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/smartcontractkit/cre-cli/internal/accessrequest"
"github.com/smartcontractkit/cre-cli/internal/credentials"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/ui"
)

Expand All @@ -25,6 +26,7 @@ func New(runtimeCtx *runtime.Context) *cobra.Command {
},
}

runtimeattach.Register(cmd, runtimeattach.CredsAndTenant)
return cmd
}

Expand Down
2 changes: 2 additions & 0 deletions cmd/account/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/smartcontractkit/cre-cli/cmd/account/list_key"
"github.com/smartcontractkit/cre-cli/cmd/account/unlink_key"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
)

func New(runtimeContext *runtime.Context) *cobra.Command {
Expand All @@ -22,5 +23,6 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
accountCmd.AddCommand(unlink_key.New(runtimeContext))
accountCmd.AddCommand(list_key.New(runtimeContext))

runtimeattach.Register(accountCmd, runtimeattach.Empty)
return accountCmd
}
2 changes: 2 additions & 0 deletions cmd/account/link_key/link_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/smartcontractkit/cre-cli/internal/credentials"
"github.com/smartcontractkit/cre-cli/internal/environments"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/settings"
"github.com/smartcontractkit/cre-cli/internal/types"
"github.com/smartcontractkit/cre-cli/internal/ui"
Expand Down Expand Up @@ -89,6 +90,7 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
settings.AddSkipConfirmation(cmd)
cmd.Flags().StringP("owner-label", "l", "", "Label for the workflow owner")

runtimeattach.Register(cmd, runtimeattach.FullWithDeploymentRPC)
return cmd
}

Expand Down
2 changes: 2 additions & 0 deletions cmd/account/list_key/list_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/smartcontractkit/cre-cli/internal/credentials"
"github.com/smartcontractkit/cre-cli/internal/environments"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/ui"
)

Expand Down Expand Up @@ -58,6 +59,7 @@ func New(runtimeCtx *runtime.Context) *cobra.Command {
return h.Execute(cmd.Context())
},
}
runtimeattach.Register(cmd, runtimeattach.CredsAndTenant)
return cmd
}

Expand Down
2 changes: 2 additions & 0 deletions cmd/account/unlink_key/unlink_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/smartcontractkit/cre-cli/internal/credentials"
"github.com/smartcontractkit/cre-cli/internal/environments"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/settings"
"github.com/smartcontractkit/cre-cli/internal/types"
"github.com/smartcontractkit/cre-cli/internal/ui"
Expand Down Expand Up @@ -87,6 +88,7 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
}
settings.AddTxnTypeFlags(cmd)
settings.AddSkipConfirmation(cmd)
runtimeattach.Register(cmd, runtimeattach.FullWithDeploymentRPC)
return cmd
}

Expand Down
2 changes: 2 additions & 0 deletions cmd/creinit/creinit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"github.com/smartcontractkit/cre-cli/internal/constants"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/settings"
"github.com/smartcontractkit/cre-cli/internal/templateconfig"
"github.com/smartcontractkit/cre-cli/internal/templaterepo"
Expand Down Expand Up @@ -82,6 +83,7 @@ Templates are fetched dynamically from GitHub repositories.`,
_ = initCmd.Flags().MarkDeprecated("template-id", "use --template instead")
_ = initCmd.Flags().MarkHidden("template-id")

runtimeattach.Register(initCmd, runtimeattach.Empty)
return initCmd
}

Expand Down
19 changes: 10 additions & 9 deletions cmd/creinit/go_module_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ func initializeGoModule(logger *zerolog.Logger, workingDirectory, moduleName str
}
}

if err := runCommand(logger, workingDirectory, "go", "get", "github.com/smartcontractkit/cre-sdk-go@"+constants.SdkVersion); err != nil {
return nil, err
}
if err := runCommand(logger, workingDirectory, "go", "get", "github.com/smartcontractkit/cre-sdk-go/capabilities/blockchain/evm@"+constants.EVMCapabilitiesVersion); err != nil {
return nil, err
}
if err := runCommand(logger, workingDirectory, "go", "get", "github.com/smartcontractkit/cre-sdk-go/capabilities/networking/http@"+constants.HTTPCapabilitiesVersion); err != nil {
return nil, err
// Single go get: one module graph resolution instead of four sequential
Copy link
Copy Markdown
Contributor Author

@timothyF95 timothyF95 Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated but improves efficiency

// downloads (important for tests under tight -timeout, e.g. -timeout=120s).
getArgs := []string{
"get",
"github.com/smartcontractkit/cre-sdk-go@" + constants.SdkVersion,
"github.com/smartcontractkit/cre-sdk-go/capabilities/blockchain/evm@" + constants.EVMCapabilitiesVersion,
"github.com/smartcontractkit/cre-sdk-go/capabilities/networking/http@" + constants.HTTPCapabilitiesVersion,
"github.com/smartcontractkit/cre-sdk-go/capabilities/scheduler/cron@" + constants.CronCapabilitiesVersion,
}
if err := runCommand(logger, workingDirectory, "go", "get", "github.com/smartcontractkit/cre-sdk-go/capabilities/scheduler/cron@"+constants.CronCapabilitiesVersion); err != nil {
if err := runCommand(logger, workingDirectory, "go", getArgs...); err != nil {
return nil, err
}

Expand All @@ -67,6 +67,7 @@ func runCommand(logger *zerolog.Logger, dir, command string, args ...string) err

cmd := exec.Command(command, args...)
cmd.Dir = dir
cmd.Env = os.Environ()

output, err := cmd.CombinedOutput()
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions cmd/generate-bindings/generate-bindings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/smartcontractkit/cre-cli/cmd/generate-bindings/bindings"
"github.com/smartcontractkit/cre-cli/internal/constants"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/ui"
"github.com/smartcontractkit/cre-cli/internal/validation"
)
Expand Down Expand Up @@ -65,6 +66,7 @@ For JSON files the ABI is read from the top-level "abi" field.`,
generateBindingsCmd.Flags().StringP("abi", "a", "", "Path to ABI directory (defaults to contracts/{chain-family}/src/abi/). Supports *.abi and *.json files")
generateBindingsCmd.Flags().StringP("pkg", "k", "bindings", "Base package name (each contract gets its own subdirectory)")

runtimeattach.Register(generateBindingsCmd, runtimeattach.Empty)
return generateBindingsCmd
}

Expand Down
2 changes: 2 additions & 0 deletions cmd/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/smartcontractkit/cre-cli/internal/environments"
"github.com/smartcontractkit/cre-cli/internal/oauth"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/tenantctx"
"github.com/smartcontractkit/cre-cli/internal/ui"
)
Expand All @@ -42,6 +43,7 @@ func New(runtimeCtx *runtime.Context) *cobra.Command {
},
}

runtimeattach.Register(cmd, runtimeattach.Empty)
return cmd
}

Expand Down
2 changes: 2 additions & 0 deletions cmd/logout/logout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/smartcontractkit/cre-cli/internal/credentials"
"github.com/smartcontractkit/cre-cli/internal/environments"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/tenantctx"
"github.com/smartcontractkit/cre-cli/internal/ui"
)
Expand All @@ -33,6 +34,7 @@ func New(runtimeCtx *runtime.Context) *cobra.Command {
return h.execute()
},
}
runtimeattach.Register(cmd, runtimeattach.Empty)
return cmd
}

Expand Down
5 changes: 4 additions & 1 deletion cmd/registry/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import (
"github.com/spf13/cobra"

"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
"github.com/smartcontractkit/cre-cli/internal/ui"
)

func New(runtimeContext *runtime.Context) *cobra.Command {
return &cobra.Command{
cmd := &cobra.Command{
Use: "list",
Short: "Lists available workflow registries for the current environment",
Long: `Displays the registries configured for your organization, including type and address.`,
Expand Down Expand Up @@ -44,4 +45,6 @@ func New(runtimeContext *runtime.Context) *cobra.Command {
return nil
},
}
runtimeattach.Register(cmd, runtimeattach.CredsAndTenant)
return cmd
}
2 changes: 2 additions & 0 deletions cmd/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/smartcontractkit/cre-cli/cmd/registry/list"
"github.com/smartcontractkit/cre-cli/internal/runtime"
"github.com/smartcontractkit/cre-cli/internal/runtimeattach"
)

func New(runtimeContext *runtime.Context) *cobra.Command {
Expand All @@ -16,5 +17,6 @@ func New(runtimeContext *runtime.Context) *cobra.Command {

registryCmd.AddCommand(list.New(runtimeContext))

runtimeattach.Register(registryCmd, runtimeattach.Empty)
return registryCmd
}
Loading
Loading