Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion cmd/internal/check_provider_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func loadLatestProvider(
if err != nil {
return nil, fmt.Errorf("resolve provider: %w", err)
}
providerConfig, err := provider.ParseProvider(bytes.NewReader(providerRaw))
providerConfig, err := provider.ParseAuthorProvider(bytes.NewReader(providerRaw))
if err != nil {
return nil, fmt.Errorf("parse provider: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/internal/get_provider_name.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (cmd *GetProviderNameCmd) Run(ctx context.Context, args []string) error {
return fmt.Errorf("resolve provider: %w", err)
}

providerConfig, err := provider.ParseProvider(bytes.NewReader(providerRaw))
providerConfig, err := provider.ParseAuthorProvider(bytes.NewReader(providerRaw))
if err != nil {
return fmt.Errorf("parse provider: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/provider/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func (cmd *AddCmd) resolveAddSource(
if providerName != "" {
return resolvedAddSource{raw: raw, source: source, name: providerName}, nil
}
parsed, err := provider.ParseProvider(bytes.NewReader(raw))
parsed, err := provider.ParseAuthorProvider(bytes.NewReader(raw))
if err != nil {
return resolvedAddSource{}, err
}
Expand Down
19 changes: 14 additions & 5 deletions cmd/provider/add_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,20 @@ func (s *addDeprecationSuite) SetupTest() {
client := devsyhttp.GetHTTPClient()
previousTransport := client.Transport
client.Transport = providerAddRoundTripper(func(req *http.Request) (*http.Response, error) {
const manifestURL = "https://github.com/devsy-org/devsy-provider-microsandbox/" +
"releases/latest/download/provider.yaml"
if req.URL.String() != manifestURL {
s.T().Fatalf("unexpected source request: %s", req.URL)
const (
latestReleaseURL = "https://api.github.com/repos/devsy-org/" +
"devsy-provider-microsandbox/releases/latest"
manifestURL = "https://github.com/devsy-org/devsy-provider-microsandbox/" +
"releases/download/v0.1.8/provider.yaml"
)
switch req.URL.String() {
case latestReleaseURL:
return providerAddResponse(req, `{"tag_name":"v0.1.8"}`), nil
case manifestURL:
return providerAddResponse(req, externalMicrosandboxManifest), nil
}
return providerAddResponse(req, externalMicrosandboxManifest), nil
s.T().Fatalf("unexpected source request: %s", req.URL)
return nil, nil
})
s.T().Cleanup(func() { client.Transport = previousTransport })
}
Expand All @@ -76,6 +84,7 @@ func (s *addDeprecationSuite) TestMicrosandboxAliasUsesLatestExternalProvider()
s.Require().Equal(tc.want, resolved.name)
s.Require().Equal("github.com/devsy-org/devsy-provider-microsandbox", resolved.source.Raw)
s.Require().Equal("devsy-org/devsy-provider-microsandbox", resolved.source.Github)
s.Require().Equal("v0.1.8", resolved.source.ResolvedRef)
parsed, err := providerpkg.ParseProvider(bytes.NewReader(resolved.raw))
s.Require().NoError(err)
s.Require().Equal(providerpkg.ExternalDriver, parsed.Agent.Driver)
Expand Down
107 changes: 107 additions & 0 deletions cmd/provider/icon.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package provider

import (
"encoding/json"
"errors"
"fmt"
"io"
"io/fs"
"os"

"github.com/devsy-org/devsy/cmd/flags"
"github.com/devsy-org/devsy/pkg/config"
cliflags "github.com/devsy-org/devsy/pkg/flags"
"github.com/devsy-org/devsy/pkg/flags/names"
"github.com/devsy-org/devsy/pkg/output"
"github.com/devsy-org/devsy/pkg/provider"
"github.com/devsy-org/devsy/pkg/telemetry"
"github.com/spf13/cobra"
)

const (
iconThemeLight = "light"
iconThemeDark = "dark"
)

// IconCmd holds the icon cmd flags.
type IconCmd struct {
*flags.GlobalFlags

Theme string
}

// NewIconCmd creates a new command.
func NewIconCmd(flags *flags.GlobalFlags) *cobra.Command {
cmd := &IconCmd{
GlobalFlags: flags,
}
iconCmd := &cobra.Command{
Use: "icon [name]",
Short: "Print an installed provider's cached icon as JSON",
Long: "Reads the icon cached for an installed provider. The result is always JSON: " +
"{revision, mimeType, dataBase64} for an image or {revision, missing: true} " +
"when the provider has no usable image for the theme. Never uses the network.",
Args: cobra.ExactArgs(1),
Annotations: telemetry.SkipInUIAnnotation(),
RunE: func(_ *cobra.Command, args []string) error {
if cmd.Context != "" {
if err := config.ValidateContextPathName(cmd.Context); err != nil {
return fmt.Errorf("invalid provider icon context: %w", err)
}
}
devsyConfig, err := config.LoadConfig(cmd.Context, cmd.Provider)
if err != nil {
return err
}

return cmd.Run(devsyConfig, args[0], os.Stdout)
},
}

cliflags.Add(
iconCmd,
cliflags.String(&cmd.Theme, names.Theme, iconThemeLight, "Icon variant: light or dark"),
)

return iconCmd
}

// Run prints the cached icon of the installed provider for the selected theme.
func (cmd *IconCmd) Run(devsyConfig *config.Config, providerName string, out io.Writer) error {
if err := cmd.validate(devsyConfig.DefaultContext, providerName); err != nil {
return err
}

providerConfig, err := provider.LoadProviderConfig(devsyConfig.DefaultContext, providerName)
if errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf("provider with name %s not found", providerName)
}
if err != nil {
return fmt.Errorf("load provider %s: %w", providerName, err)
}

result, err := provider.ReadProviderIcon(devsyConfig.DefaultContext, providerConfig, cmd.Theme)
if err != nil {
return fmt.Errorf("read icon of provider %s: %w", providerName, err)
}

return json.NewEncoder(out).Encode(result)
}

func (cmd *IconCmd) validate(defaultContext, providerName string) error {
if err := config.ValidateContextPathName(defaultContext); err != nil {
return fmt.Errorf("invalid provider icon context: %w", err)
}
if err := validateProviderName(providerName); err != nil {
return err
}
if cmd.Theme != iconThemeLight && cmd.Theme != iconThemeDark {
return fmt.Errorf("unexpected theme %q, choose light or dark", cmd.Theme)
}
// The icon is a data contract for machine consumers, but an invalid
// format must still fail like it does for every other command.
if _, err := output.ResolveMode(cmd.ResultFormat); err != nil {
return err
}
return nil
}
Loading
Loading