Skip to content

test(endtoend): Pull region from environment #2750

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
kyleconroy merged 6 commits into from
Sep 20, 2023
Merged

test(endtoend): Pull region from environment #2750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2011a20
test(endtoend): Pull region from environment
kyleconroy Sep 20, 2023
6e16b9f
fix ci.yml
kyleconroy Sep 20, 2023
d72ac19
Get region in code, not CI
kyleconroy Sep 20, 2023
75e9daa
remove logging
kyleconroy Sep 20, 2023
f11b9ad
include region in error
kyleconroy Sep 20, 2023
f6fadb5
log other spot
kyleconroy Sep 20, 2023
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
Prev Previous commit
Next Next commit
Get region in code, not CI
  • Loading branch information
@kyleconroy
kyleconroy committed Sep 20, 2023
commit d72ac19a89f8f37855d39380069937a89e5b5ac3
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ jobs:
with:
go-version: '1.21.1'

- name: set sqlc region
run: |
curl -I -s -o foo.txt -w 'SQLC_REGION=%header{fly-region}' https://debug.fly.dev >> "$GITHUB_ENV"

- name: install gotestsum
run: go install gotest.tools/gotestsum@latest

Expand Down
4 changes: 2 additions & 2 deletions internal/endtoend/ddl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestValidSchema(t *testing.T) {
projectID := os.Getenv("CI_SQLC_PROJECT_ID")
authToken := os.Getenv("CI_SQLC_AUTH_TOKEN")

fmt.Println("region", os.Getenv("SQLC_REGION"))
fmt.Println("region", quickdb.GetClosestRegion())

if projectID == "" || authToken == "" {
if os.Getenv("CI") == "" {
Expand Down Expand Up @@ -109,7 +109,7 @@ func TestValidSchema(t *testing.T) {

resp, err := client.CreateEphemeralDatabase(ctx, &pb.CreateEphemeralDatabaseRequest{
Engine: "postgresql",
Region: os.Getenv("SQLC_REGION"),
Region: quickdb.GetClosestRegion(),
Migrations: sqls,
})
if err != nil {
Expand Down
19 changes: 19 additions & 0 deletions internal/quickdb/region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package quickdb

import (
"net/http"
"sync"
)

var region string
var once sync.Once

func GetClosestRegion() string {
once.Do(func() {
resp, err := http.Get("https://debug.fly.dev")
if err == nil {
region = resp.Header.Get("Fly-Region")
}
})
return region
}
4 changes: 2 additions & 2 deletions internal/sqltest/hosted/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ func PostgreSQL(t *testing.T, migrations []string) string {
seed = append(seed, string(blob))
}

fmt.Println("region", os.Getenv("SQLC_REGION"))
fmt.Println("region", quickdb.GetClosestRegion())
resp, err := client.CreateEphemeralDatabase(ctx, &pb.CreateEphemeralDatabaseRequest{
Engine: "postgresql",
Region: os.Getenv("SQLC_REGION"),
Region: quickdb.GetClosestRegion(),
Migrations: seed,
})
if err != nil {
Expand Down