Skip to content

CLOUDP-225860: Add support for sha in split command #450

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

Merged
merged 2 commits into from
Feb 24, 2025
Merged

CLOUDP-225860: Add support for sha in split command #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a3fdff
CLOUDP-225860: Add support for sha in split command
blva Feb 24, 2025
ef99e7a
Add unit test
blva Feb 24, 2025
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
8 changes: 8 additions & 0 deletions tools/cli/internal/cli/split/split.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ type Opts struct {
outputPath string
env string
format string
gitSha string
}

func (o *Opts) Run() error {
Expand All @@ -55,6 +56,12 @@ func (o *Opts) Run() error {
return err
}

if o.gitSha != "" {
filteredOAS.Info.Extensions = map[string]any{
"x-xgen-sha": o.gitSha,
}
}

if err := o.saveVersionedOas(filteredOAS, version); err != nil {
return err
}
Expand Down Expand Up @@ -130,6 +137,7 @@ func Builder() *cobra.Command {
cmd.Flags().StringVar(&opts.env, flag.Environment, "", usage.Environment)
cmd.Flags().StringVarP(&opts.outputPath, flag.Output, flag.OutputShort, "", usage.Output)
cmd.Flags().StringVarP(&opts.format, flag.Format, flag.FormatShort, openapi.JSON, usage.Format)
cmd.Flags().StringVar(&opts.gitSha, flag.GitSha, "", usage.GitSha)

_ = cmd.MarkFlagRequired(flag.Output)

Expand Down
20 changes: 20 additions & 0 deletions tools/cli/internal/cli/split/split_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,26 @@ func TestSplitMulitplePreviewsRun(t *testing.T) {
require.Contains(t, info.Spec.Paths.Map(), "/api/atlas/v2/groups/{groupId}/serviceAccounts")
}

func TestInjectSha_Run(t *testing.T) {
fs := afero.NewMemMapFs()
opts := &Opts{
basePath: "../../../test/data/base_spec.json",
outputPath: "foas.yaml",
fs: fs,
gitSha: "123456",
}

if err := opts.Run(); err != nil {
t.Fatalf("Run() unexpected error: %v", err)
}

result, err := loadRunResultOas(fs, "foas-2023-01-01.yaml")
require.NoError(t, err)
// check sha
require.Contains(t, result.Spec.Info.Extensions, "x-xgen-sha")
require.Equal(t, "123456", result.Spec.Info.Extensions["x-xgen-sha"])
}

func TestOpts_PreRunE(t *testing.T) {
testCases := []struct {
wantErr require.ErrorAssertionFunc
Expand Down
Loading