Crown Jewel fixes (#42649)

* Crown Jewel fixes * Allow passing multiple resource names as crown jewel * Rename requests fields * Add kind validation * GCI
gravitational · Jun 12, 2024 · 5c806eb · 5c806eb
1 parent 4182a25
commit 5c806eb
Show file tree

Hide file tree

Showing 9 changed files with 211 additions and 171 deletions.
diff --git a/api/client/crownjewel/crownjewel.go b/api/client/crownjewel/crownjewel.go
@@ -50,7 +50,7 @@ func (c *Client) ListCrownJewels(ctx context.Context, pageSize int64, nextToken
 // CreateCrownJewel creates a new Crown Jewel.
 func (c *Client) CreateCrownJewel(ctx context.Context, req *crownjewelv1.CrownJewel) (*crownjewelv1.CrownJewel, error) {
 	rsp, err := c.grpcClient.CreateCrownJewel(ctx, &crownjewelv1.CreateCrownJewelRequest{
-		CrownJewels: req,
+		CrownJewel: req,
 	})
 	if err != nil {
 		return nil, trace.Wrap(err)
@@ -72,7 +72,7 @@ func (c *Client) GetCrownJewel(ctx context.Context, name string) (*crownjewelv1.
 // UpdateCrownJewel updates an existing Crown Jewel.
 func (c *Client) UpdateCrownJewel(ctx context.Context, req *crownjewelv1.CrownJewel) (*crownjewelv1.CrownJewel, error) {
 	rsp, err := c.grpcClient.UpdateCrownJewel(ctx, &crownjewelv1.UpdateCrownJewelRequest{
-		CrownJewels: req,
+		CrownJewel: req,
 	})
 	if err != nil {
 		return nil, trace.Wrap(err)
@@ -83,7 +83,7 @@ func (c *Client) UpdateCrownJewel(ctx context.Context, req *crownjewelv1.CrownJe
 // UpsertCrownJewel upserts a Crown Jewel.
 func (c *Client) UpsertCrownJewel(ctx context.Context, req *crownjewelv1.CrownJewel) (*crownjewelv1.CrownJewel, error) {
 	rsp, err := c.grpcClient.UpsertCrownJewel(ctx, &crownjewelv1.UpsertCrownJewelRequest{
-		CrownJewels: req,
+		CrownJewel: req,
 	})
 	if err != nil {
 		return nil, trace.Wrap(err)

diff --git a/api/gen/proto/go/teleport/crownjewel/v1/crownjewel.pb.go b/api/gen/proto/go/teleport/crownjewel/v1/crownjewel.pb.go