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
19 changes: 13 additions & 6 deletions cli/module_generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ func (c *viamClient) generateModuleAction(cCtx *cli.Context, args generateModule

s := spinner.New()
var fatalError error
var registryURL string
nonFatalError := false
gArgs, err := getGlobalArgs(cCtx)
if err != nil {
Expand All @@ -162,7 +163,8 @@ func (c *viamClient) generateModuleAction(cCtx *cli.Context, args generateModule
}

s.Title("Creating module and generating manifest...")
if err = createModuleAndManifest(cCtx, c, *newModule, globalArgs); err != nil {
registryURL, err = createModuleAndManifest(cCtx, c, *newModule, globalArgs)
if err != nil {
fatalError = err
return
}
Expand Down Expand Up @@ -219,6 +221,9 @@ func (c *viamClient) generateModuleAction(cCtx *cli.Context, args generateModule
cwd = "."
}
printf(cCtx.App.Writer, "Module successfully generated at %s%s%s", cwd, string(os.PathSeparator), newModule.ModuleName)
if registryURL != "" {
printf(cCtx.App.Writer, "You can view it here: %s", registryURL)
}
return nil
}

Expand Down Expand Up @@ -811,28 +816,30 @@ func getLatestSDKTag(c *cli.Context, language string, globalArgs globalArgs) (st
return version, nil
}

func createModuleAndManifest(cCtx *cli.Context, c *viamClient, module modulegen.ModuleInputs, globalArgs globalArgs) error {
func createModuleAndManifest(cCtx *cli.Context, c *viamClient, module modulegen.ModuleInputs, globalArgs globalArgs) (string, error) {
var moduleID moduleID
var registryURL string
if module.RegisterOnApp {
debugf(cCtx.App.Writer, globalArgs.Debug, "Registering module with Viam")
moduleResponse, err := c.createModule(module.ModuleName, module.OrgID)
if err != nil {
return errors.Wrap(err, "failed to register module")
return "", errors.Wrap(err, "failed to register module")
}
moduleID, err = parseModuleID(moduleResponse.GetModuleId())
if err != nil {
return errors.Wrap(err, "failed to parse module identifier")
return "", errors.Wrap(err, "failed to parse module identifier")
}
registryURL = moduleResponse.GetUrl()
} else {
debugf(cCtx.App.Writer, globalArgs.Debug, "Creating a local-only module")
moduleID.name = module.ModuleName
moduleID.prefix = module.Namespace
}
err := renderManifest(cCtx, moduleID.String(), module, globalArgs)
if err != nil {
return errors.Wrap(err, "failed to render manifest")
return "", errors.Wrap(err, "failed to render manifest")
}
return nil
return registryURL, nil
}

// Create the README.md file.
Expand Down
2 changes: 1 addition & 1 deletion cli/module_generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func TestGenerateModuleAction(t *testing.T) {
return &v1.StartBuildResponse{BuildId: "xyz123"}, nil
},
}, map[string]any{}, "token")
err := createModuleAndManifest(cCtx, ac, testModule, globalArgs)
_, err := createModuleAndManifest(cCtx, ac, testModule, globalArgs)
test.That(t, err, test.ShouldBeNil)
})

Expand Down