fixes

Author: leafty

pkg/cmd/updateglobalimages.go

@@ -92,6 +92,14 @@ func updateGlobalImages(cmd *cobra.Command, args []string) {
 			showCmd = showCmd + fmt.Sprintf(" --namespace %s", namespace)
 		}
 		fmt.Printf("Please run \"%s\" before running this command\n", showCmd)
+		os.Exit(1)
+	}
+
+	if !rac.IsAdmin(ctx) {
+		fmt.Println("Error: not an admin")
+		fmt.Println("Please make sure you are a Renku admin before running this command")
+		fmt.Println("See: rdu make-me-admin --help")
+		os.Exit(1)
 	}
 
 	rsc, err := rac.Session()

pkg/renkuapi/client.go

@@ -54,8 +54,20 @@ func (rac *RenkuApiClient) IsLoggedIn(ctx context.Context) bool {
 	return token != ""
 }
 
+func (rac *RenkuApiClient) IsAdmin(ctx context.Context) bool {
+	ruc, err := rac.Users()
+	if err != nil {
+		return false
+	}
+	userInfo, err := ruc.GetUser(ctx)
+	if err != nil {
+		return false
+	}
+	return userInfo.IsAdmin
+}
+
 func (rac *RenkuApiClient) Session() (rsc *session.RenkuSessionClient, err error) {
-	if rac.ruc == nil {
+	if rac.rsc == nil {
 		rsc, err = session.NewRenkuSessionClient(rac.baseURL.String(), session.WithRequestEditors(session.RequestEditorFn(rac.auth.RequestEditor())))
 		if err != nil {
 			return nil, err

pkg/renkuapi/session/session.go

@@ -13,7 +13,7 @@ import (
 //go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -generate types,client,spec -package session -o session_gen.go api.spec.yaml
 
 type RenkuSessionClient struct {
-	bacseClient    *ClientWithResponses
+	baseClient     *ClientWithResponses
 	httpClient     *http.Client
 	requestEditors []RequestEditorFn
 }
@@ -47,7 +47,7 @@ func NewRenkuSessionClient(apiURL string, options ...RenkuSessionClientOption) (
 	if err != nil {
 		return nil, err
 	}
-	c.bacseClient = client
+	c.baseClient = client
 	return c, nil
 }
 
@@ -68,7 +68,7 @@ func WithRequestEditors(editors ...RequestEditorFn) RenkuSessionClientOption {
 }
 
 func (c *RenkuSessionClient) GetGlobalEnvironments(ctx context.Context) (environments EnvironmentList, err error) {
-	res, err := c.bacseClient.GetEnvironmentsWithResponse(ctx, nil)
+	res, err := c.baseClient.GetEnvironmentsWithResponse(ctx, nil)
 	if err != nil {
 		return environments, err
 	}
@@ -86,7 +86,7 @@ func (c *RenkuSessionClient) GetGlobalEnvironments(ctx context.Context) (environ
 }
 
 func (c *RenkuSessionClient) PostGlobalEnvironment(ctx context.Context, body EnvironmentPost) (environment Environment, err error) {
-	res, err := c.bacseClient.PostEnvironmentsWithResponse(ctx, body)
+	res, err := c.baseClient.PostEnvironmentsWithResponse(ctx, body)
 	if err != nil {
 		return environment, err
 	}
@@ -104,7 +104,7 @@ func (c *RenkuSessionClient) PostGlobalEnvironment(ctx context.Context, body Env
 }
 
 func (c *RenkuSessionClient) PatchGlobalEnvironment(ctx context.Context, environmentId Ulid, body EnvironmentPatch) (environment Environment, err error) {
-	res, err := c.bacseClient.PatchEnvironmentsEnvironmentIdWithResponse(ctx, environmentId, body)
+	res, err := c.baseClient.PatchEnvironmentsEnvironmentIdWithResponse(ctx, environmentId, body)
 	if err != nil {
 		return environment, err
 	}
@@ -125,7 +125,11 @@ func (c *RenkuSessionClient) PatchGlobalEnvironment(ctx context.Context, environ
 }
 
 func (c *RenkuSessionClient) UpdateGlobalImages(ctx context.Context, images []string, tag string, existingEnvironments EnvironmentList, dryRun bool) error {
-	fmt.Println("Performing the following updates:")
+	if dryRun {
+		fmt.Println("The following updates would be performed:")
+	} else {
+		fmt.Println("Performing the following updates:")
+	}
 	for _, image := range images {
 		_, err := c.updateGlobalImage(ctx, image, tag, existingEnvironments, dryRun)
 		if err != nil {

pkg/renkuapi/users/users.go

@@ -11,7 +11,7 @@ import (
 //go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -generate types,client,spec -package users -o users_gen.go api.spec.yaml
 
 type RenkuUsersClient struct {
-	bacseClient    *ClientWithResponses
+	baseClient     *ClientWithResponses
 	httpClient     *http.Client
 	requestEditors []RequestEditorFn
 }
@@ -45,7 +45,7 @@ func NewRenkuUsersClient(apiURL string, options ...RenkuUsersClientOption) (c *R
 	if err != nil {
 		return nil, err
 	}
-	c.bacseClient = client
+	c.baseClient = client
 	return c, nil
 }
 
@@ -66,7 +66,7 @@ func WithRequestEditors(editors ...RequestEditorFn) RenkuUsersClientOption {
 }
 
 func (c *RenkuUsersClient) GetUser(ctx context.Context) (userInfo SelfUserInfo, err error) {
-	res, err := c.bacseClient.GetUserWithResponse(ctx)
+	res, err := c.baseClient.GetUserWithResponse(ctx)
 	if err != nil {
 		return userInfo, err
 	}