Skip to content

CLOUDP-250827: renaming data files #41

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 14 commits into from
May 28, 2024
Merged

CLOUDP-250827: renaming data files #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a6d8ef3
CLOUDP-250827: Add e2e test for foascli -Part 1
andreaangiolillo May 27, 2024
9928ff8
Update code-health-tools.yml
andreaangiolillo May 27, 2024
d71e8df
Update code-health-tools.yml
andreaangiolillo May 27, 2024
691971d
CLOUDP-250827: Add e2e test for foascli -Part 1
andreaangiolillo May 27, 2024
17265ee
CLOUDP-250827: Add e2e test for foascli -Part 1
andreaangiolillo May 27, 2024
2a25168
Update Makefile
andreaangiolillo May 27, 2024
a8b941a
added e2e test scenarios
andreaangiolillo May 27, 2024
bd813c7
added e2e test scenarios
andreaangiolillo May 27, 2024
cf0f1c9
Update merge_test.go
andreaangiolillo May 27, 2024
e9eb1ec
Update merge_test.go
andreaangiolillo May 27, 2024
819508f
Update merge_test.go
andreaangiolillo May 27, 2024
5882f74
Merge remote-tracking branch 'origin/main' into CLOUDP-250827_part3
andreaangiolillo May 28, 2024
50d5db3
fix: renaming data file names
andreaangiolillo May 28, 2024
de5eb98
Update merge_test.go
andreaangiolillo May 28, 2024
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 tools/cli/internal/cli/merge/merge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestOpts_PreRunE(t *testing.T) {
},
{
wantErr: require.NoError,
basePath: "../../../test/data/valid_base_spec.json",
basePath: "../../../test/data/base_spec.json",
name: "Successful",
externalPaths: []string{"test"},
},
Expand Down
4 changes: 2 additions & 2 deletions ...cli/test/data/valid_apiregistry_spec.json → tools/cli/test/data/apiregistry_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"operationId": "getOpenApiInfo",
"parameters": [
{
"$ref": "valid_base_spec.json#/components/parameters/pretty"
"$ref": "base_spec.json#/components/parameters/pretty"
}
],
"responses": {
Expand All @@ -53,7 +53,7 @@
}
},
"500": {
"$ref": "valid_base_spec.json#/components/responses/internalServerError"
"$ref": "base_spec.json#/components/responses/internalServerError"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/test/data/valid_authn_spec.json → tools/cli/test/data/authn_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"operationId": "getOpenApiInfo",
"parameters": [
{
"$ref": "valid_base_spec.json#/components/parameters/pretty"
"$ref": "base_spec.json#/components/parameters/pretty"
}
],
"responses": {
Expand All @@ -53,7 +53,7 @@
}
},
"500": {
"$ref": "valid_base_spec.json#/components/responses/internalServerError"
"$ref": "base_spec.json#/components/responses/internalServerError"
}
}
}
Expand Down
0 tools/cli/test/data/valid_base_spec.json → tools/cli/test/data/base_spec.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions tools/cli/test/data/duplicated_path_apiregistry_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"operationId": "getOpenApiInfo",
"parameters": [
{
"$ref": "valid_base_spec.json#/components/parameters/pretty"
"$ref": "base_spec.json#/components/parameters/pretty"
}
],
"responses": {
Expand All @@ -53,7 +53,7 @@
}
},
"500": {
"$ref": "valid_base_spec.json#/components/responses/internalServerError"
"$ref": "base_spec.json#/components/responses/internalServerError"
}
}
}
Expand All @@ -66,7 +66,7 @@
"operationId": "getOpenApiInfo",
"parameters": [
{
"$ref": "valid_base_spec.json#/components/parameters/pretty"
"$ref": "base_spec.json#/components/parameters/pretty"
}
],
"responses": {
Expand All @@ -91,7 +91,7 @@
}
},
"500": {
"$ref": "valid_base_spec.json#/components/responses/internalServerError"
"$ref": "base_spec.json#/components/responses/internalServerError"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/test/data/duplicated_tag_authn_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"operationId": "getOpenApiInfo",
"parameters": [
{
"$ref": "valid_base_spec.json#/components/parameters/pretty"
"$ref": "base_spec.json#/components/parameters/pretty"
}
],
"responses": {
Expand All @@ -53,7 +53,7 @@
}
},
"500": {
"$ref": "valid_base_spec.json#/components/responses/internalServerError"
"$ref": "base_spec.json#/components/responses/internalServerError"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/test/data/not_identical_component_apiregistry_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"operationId": "getOpenApiInfo",
"parameters": [
{
"$ref": "valid_base_spec.json#/components/parameters/pretty"
"$ref": "base_spec.json#/components/parameters/pretty"
}
],
"responses": {
Expand All @@ -53,7 +53,7 @@
}
},
"500": {
"$ref": "valid_base_spec.json#/components/responses/internalServerError"
"$ref": "base_spec.json#/components/responses/internalServerError"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions tools/cli/test/e2e/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ func NewBin() (string, error) {
}

func NewBaseSpec() (string, error) {
cliPath, err := filepath.Abs("../../data/valid_base_spec.json")
cliPath, err := filepath.Abs("../../data/base_spec.json")
if err != nil {
return "", err
}
return cliPath, nil
}

func NewValidAPIRegistrySpec() (string, error) {
cliPath, err := filepath.Abs("../../data/valid_apiregistry_spec.json")
func NewAPIRegistrySpec() (string, error) {
cliPath, err := filepath.Abs("../../data/apiregistry_spec.json")
if err != nil {
return "", err
}
return cliPath, nil
}

func NewValidAuthNSpec() (string, error) {
cliPath, err := filepath.Abs("../../data/valid_authn_spec.json")
func NewAuthNSpec() (string, error) {
cliPath, err := filepath.Abs("../../data/authn_spec.json")
if err != nil {
return "", err
}
Expand Down
8 changes: 4 additions & 4 deletions tools/cli/test/e2e/cli/merge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestMerge(t *testing.T) {
t.Run("Merge valid specs", func(t *testing.T) {
base, err := NewBaseSpec()
require.NoError(t, err)
external, err := NewValidAPIRegistrySpec()
external, err := NewAPIRegistrySpec()
require.NoError(t, err)

cmd := exec.Command(cliPath,
Expand All @@ -43,7 +43,7 @@ func TestMerge(t *testing.T) {
require.NoError(t, err)
apiRegistrySpec, err := NewDuplicatedPathAPIRegistrySpec()
require.NoError(t, err)
authnSpec, err := NewValidAuthNSpec()
authnSpec, err := NewAuthNSpec()
require.NoError(t, err)

cmd := exec.Command(cliPath,
Expand All @@ -66,7 +66,7 @@ func TestMerge(t *testing.T) {
t.Run("Expecting Error: Merge duplicated tag", func(t *testing.T) {
base, err := NewBaseSpec()
require.NoError(t, err)
apiRegistrySpec, err := NewValidAPIRegistrySpec()
apiRegistrySpec, err := NewAPIRegistrySpec()
require.NoError(t, err)
authnSpec, err := NewDuplicatedTagAuthNSpec()
require.NoError(t, err)
Expand All @@ -93,7 +93,7 @@ func TestMerge(t *testing.T) {
require.NoError(t, err)
apiRegistrySpec, err := NewNotIdenticalComponentPIRegistrySpec()
require.NoError(t, err)
authnSpec, err := NewValidAuthNSpec()
authnSpec, err := NewAuthNSpec()
require.NoError(t, err)

cmd := exec.Command(cliPath,
Expand Down