这是indexloc提供的服务，不要输入任何密码
Skip to content

cli(test): refactor integration test metadata directory #4491

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 3 commits into from
Apr 22, 2020
Merged

cli(test): refactor integration test metadata directory #4491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5baf03
cli(test): refactor integration test metadata directory
arvi3411301 Apr 20, 2020
c18a9dc
fix test
arvi3411301 Apr 20, 2020
3365d71
Merge branch 'master' into cli-integration-test-refactor
shahidhk Apr 22, 2020
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
4 changes: 2 additions & 2 deletions .circleci/test-cli-with-last-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ PID=$!
wait_for_port 8080

# test cli
HASURA_GRAPHQL_TEST_ENDPOINT="http://localhost:8080" TEST_TAGS="latest_release" make test
HASURA_GRAPHQL_TEST_ENDPOINT="http://localhost:8080" make test

# kill the running server
kill -s INT $PID
Expand All @@ -47,5 +47,5 @@ PID=$!
wait_for_port 8080

# test cli
HASURA_GRAPHQL_TEST_ENDPOINT="http://localhost:8080" HASURA_GRAPHQL_TEST_ADMIN_SECRET="abcd" TEST_TAGS="latest_release" make test
HASURA_GRAPHQL_TEST_ENDPOINT="http://localhost:8080" HASURA_GRAPHQL_TEST_ADMIN_SECRET="abcd" make test
kill -s INT $PID
10 changes: 5 additions & 5 deletions cli/integration_test/v1/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
},
nil,
"",
filepath.Join(currDir, getMetadataDir(), "1_metadata.yaml"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "1_metadata.yaml"),
},
{
"metadata-apply",
Expand All @@ -44,7 +44,7 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
ActionType: "apply",
},
nil,
filepath.Join(currDir, getMetadataDir(), "2_metadata.yaml"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "2_metadata.yaml"),
"",
},
{
Expand All @@ -55,7 +55,7 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
},
nil,
"",
filepath.Join(currDir, getMetadataDir(), "2_metadata.yaml"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "2_metadata.yaml"),
},
{
"metadata-clear",
Expand All @@ -75,13 +75,13 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
},
nil,
"",
filepath.Join(currDir, getMetadataDir(), "1_metadata.yaml"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "1_metadata.yaml"),
},
{
"metadata-diff",
&commands.MetadataDiffOptions{
EC: ec,
Args: []string{filepath.Join(currDir, getMetadataDir(), "2_metadata.yaml")},
Args: []string{filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "2_metadata.yaml")},
Output: new(bytes.Buffer),
},
nil,
Expand Down
0 ...egration_test/v1/metadata/1_metadata.yaml → ...n_test/v1/metadata/latest/1_metadata.yaml
View file
Open in desktop
File renamed without changes.
0 ...egration_test/v1/metadata/2_metadata.yaml → ...n_test/v1/metadata/latest/2_metadata.yaml
View file
Open in desktop
File renamed without changes.
0 ...n_test/v1/metadata_latest/1_metadata.yaml → ...ion_test/v1/metadata/v1.1/1_metadata.yaml
View file
Open in desktop
File renamed without changes.
0 ...n_test/v1/metadata_latest/2_metadata.yaml → ...ion_test/v1/metadata/v1.1/2_metadata.yaml
View file
Open in desktop
File renamed without changes.
30 changes: 26 additions & 4 deletions cli/integration_test/v1/metadata_dir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
//+build !latest_release

package v1

func getMetadataDir() string {
return "v1/metadata"
import (
"fmt"
"os"
"path/filepath"

"github.com/Masterminds/semver"
)

const (
metadataDirPrefix = "v1/metadata"
)

func getMetadataDir(serverVersion *semver.Version) string {
var version string
if serverVersion == nil {
version = "latest"
} else {
currDir, _ := os.Getwd()
versionDir := fmt.Sprintf("v%d.%d", serverVersion.Major(), serverVersion.Minor())
if _, err := os.Stat(filepath.Join(currDir, metadataDirPrefix, versionDir)); err != nil {
version = "latest"
} else {
version = versionDir
}
}
return filepath.Join(metadataDirPrefix, version)
}
7 changes: 0 additions & 7 deletions cli/integration_test/v1/metadata_dir_latest.go
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions cli/integration_test/v2/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
},
nil,
"",
filepath.Join(currDir, getMetadataDir(), "1_metadata"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "1_metadata"),
},
{
"metadata-apply",
Expand All @@ -43,7 +43,7 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
ActionType: "apply",
},
nil,
filepath.Join(currDir, getMetadataDir(), "2_metadata"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "2_metadata"),
"",
},
{
Expand All @@ -54,7 +54,7 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
},
nil,
"",
filepath.Join(currDir, getMetadataDir(), "2_metadata"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "2_metadata"),
},
{
"metadata-clear",
Expand All @@ -74,13 +74,13 @@ func TestMetadataCmd(t *testing.T, ec *cli.ExecutionContext) {
},
nil,
"",
filepath.Join(currDir, getMetadataDir(), "1_metadata"),
filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "1_metadata"),
},
{
"metadata-diff",
&commands.MetadataDiffOptions{
EC: ec,
Args: []string{filepath.Join(currDir, getMetadataDir(), "1_metadata")},
Args: []string{filepath.Join(currDir, getMetadataDir(ec.Version.ServerSemver), "1_metadata")},
Output: new(bytes.Buffer),
},
nil,
Expand Down
0 ...st/v2/metadata/1_metadata/actions.graphql → ...etadata/latest/1_metadata/actions.graphql
View file
Open in desktop
File renamed without changes.
0 ..._test/v2/metadata/1_metadata/actions.yaml → ...2/metadata/latest/1_metadata/actions.yaml
View file
Open in desktop
File renamed without changes.
0 ...st/v2/metadata/1_metadata/allow_list.yaml → ...etadata/latest/1_metadata/allow_list.yaml
View file
Open in desktop
File renamed without changes.
0 ...est/v2/metadata/1_metadata/functions.yaml → ...metadata/latest/1_metadata/functions.yaml
View file
Open in desktop
File renamed without changes.
0 ...etadata/1_metadata/query_collections.yaml → .../latest/1_metadata/query_collections.yaml
View file
Open in desktop
File renamed without changes.
0 ...2/metadata/1_metadata/remote_schemas.yaml → ...ata/latest/1_metadata/remote_schemas.yaml
View file
Open in desktop
File renamed without changes.
0 ...n_test/v2/metadata/1_metadata/tables.yaml → ...v2/metadata/latest/1_metadata/tables.yaml
View file
Open in desktop
File renamed without changes.
0 ..._test/v2/metadata/1_metadata/version.yaml → ...2/metadata/latest/1_metadata/version.yaml
View file
Open in desktop
File renamed without changes.
0 ...st/v2/metadata/2_metadata/actions.graphql → ...etadata/latest/2_metadata/actions.graphql
View file
Open in desktop
File renamed without changes.
0 ..._test/v2/metadata/2_metadata/actions.yaml → ...2/metadata/latest/2_metadata/actions.yaml
View file
Open in desktop
File renamed without changes.
0 ...st/v2/metadata/2_metadata/allow_list.yaml → ...etadata/latest/2_metadata/allow_list.yaml
View file
Open in desktop
File renamed without changes.
0 ...est/v2/metadata/2_metadata/functions.yaml → ...metadata/latest/2_metadata/functions.yaml
View file
Open in desktop
File renamed without changes.
0 ...etadata/2_metadata/query_collections.yaml → .../latest/2_metadata/query_collections.yaml
View file
Open in desktop
File renamed without changes.
0 ...2/metadata/2_metadata/remote_schemas.yaml → ...ata/latest/2_metadata/remote_schemas.yaml
View file
Open in desktop
File renamed without changes.
0 ...n_test/v2/metadata/2_metadata/tables.yaml → ...v2/metadata/latest/2_metadata/tables.yaml
View file
Open in desktop
File renamed without changes.
0 ..._test/v2/metadata/2_metadata/version.yaml → ...2/metadata/latest/2_metadata/version.yaml
View file
Open in desktop
File renamed without changes.
0 ...etadata_latest/1_metadata/allow_list.yaml → .../metadata/v1.1/1_metadata/allow_list.yaml
View file
Open in desktop
File renamed without changes.
0 ...metadata_latest/1_metadata/functions.yaml → ...2/metadata/v1.1/1_metadata/functions.yaml
View file
Open in desktop
File renamed without changes.
0 ..._latest/1_metadata/query_collections.yaml → ...ta/v1.1/1_metadata/query_collections.yaml
View file
Open in desktop
File renamed without changes.
0 ...ata_latest/1_metadata/remote_schemas.yaml → ...adata/v1.1/1_metadata/remote_schemas.yaml
View file
Open in desktop
File renamed without changes.
0 ...v2/metadata_latest/1_metadata/tables.yaml → ...t/v2/metadata/v1.1/1_metadata/tables.yaml
View file
Open in desktop
File renamed without changes.
0 ...2/metadata_latest/1_metadata/version.yaml → .../v2/metadata/v1.1/1_metadata/version.yaml
View file
Open in desktop
File renamed without changes.
0 ...etadata_latest/2_metadata/allow_list.yaml → .../metadata/v1.1/2_metadata/allow_list.yaml
View file
Open in desktop
File renamed without changes.
0 ...metadata_latest/2_metadata/functions.yaml → ...2/metadata/v1.1/2_metadata/functions.yaml
View file
Open in desktop
File renamed without changes.
0 ..._latest/2_metadata/query_collections.yaml → ...ta/v1.1/2_metadata/query_collections.yaml
View file
Open in desktop
File renamed without changes.
0 ...ata_latest/2_metadata/remote_schemas.yaml → ...adata/v1.1/2_metadata/remote_schemas.yaml
View file
Open in desktop
File renamed without changes.
0 ...v2/metadata_latest/2_metadata/tables.yaml → ...t/v2/metadata/v1.1/2_metadata/tables.yaml
View file
Open in desktop
File renamed without changes.
0 ...2/metadata_latest/2_metadata/version.yaml → .../v2/metadata/v1.1/2_metadata/version.yaml
View file
Open in desktop
File renamed without changes.
30 changes: 26 additions & 4 deletions cli/integration_test/v2/metadata_dir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
//+build !latest_release

package v2

func getMetadataDir() string {
return "v2/metadata"
import (
"fmt"
"os"
"path/filepath"

"github.com/Masterminds/semver"
)

const (
metadataDirPrefix = "v2/metadata"
)

func getMetadataDir(serverVersion *semver.Version) string {
var version string
if serverVersion == nil {
version = "latest"
} else {
currDir, _ := os.Getwd()
versionDir := fmt.Sprintf("v%d.%d", serverVersion.Major(), serverVersion.Minor())
if _, err := os.Stat(filepath.Join(currDir, metadataDirPrefix, versionDir)); err != nil {
version = "latest"
} else {
version = versionDir
}
}
return filepath.Join(metadataDirPrefix, version)
}
7 changes: 0 additions & 7 deletions cli/integration_test/v2/metadata_dir_latest.go
View file
Open in desktop

This file was deleted.