Skip to content

Commit 55095cf

Browse files
authored
Move internal/config to /config (#770)
This allows configs to be created and more importantly referenced as fields in other projects which depend on Complement internals. Previously, we could only create configs via `NewTestPackage().GetConfig()` which would set the config from env vars.
1 parent 1adbd54 commit 55095cf

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

cmd/homerunner/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/matrix-org/complement/internal/config"
12+
"github.com/matrix-org/complement/config"
1313
"github.com/matrix-org/complement/internal/docker"
1414
"github.com/sirupsen/logrus"
1515
)
@@ -36,7 +36,7 @@ func (c *Config) DeriveComplementConfig(baseImageURI string) *config.Complement
3636

3737
func Getenv(key string, default_value string) string {
3838
value, exists := os.LookupEnv(key)
39-
if (exists) {
39+
if exists {
4040
return value
4141
} else {
4242
return default_value

cmd/perftest/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"io/ioutil"
77
"os"
88

9-
"github.com/matrix-org/complement/internal/config"
9+
"github.com/matrix-org/complement/config"
1010
"github.com/matrix-org/complement/internal/docker"
1111
)
1212

File renamed without changes.

federation/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"github.com/matrix-org/gomatrixserverlib"
3131
"github.com/matrix-org/util"
3232

33+
"github.com/matrix-org/complement/config"
3334
"github.com/matrix-org/complement/ct"
34-
"github.com/matrix-org/complement/internal/config"
3535
)
3636

3737
// Subset of Deployment used in federation

federation/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77
"testing"
88

9-
"github.com/matrix-org/complement/internal/config"
9+
"github.com/matrix-org/complement/config"
1010
)
1111

1212
type fedDeploy struct {

internal/docker/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/docker/go-connections/nat"
2929

3030
"github.com/matrix-org/complement/b"
31-
"github.com/matrix-org/complement/internal/config"
31+
"github.com/matrix-org/complement/config"
3232
"github.com/matrix-org/complement/internal/instruction"
3333
)
3434

internal/docker/deployer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"github.com/docker/docker/api/types/mount"
4141
"github.com/docker/docker/api/types/network"
4242

43-
"github.com/matrix-org/complement/internal/config"
43+
"github.com/matrix-org/complement/config"
4444
)
4545

4646
const (

internal/docker/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"time"
99

1010
"github.com/matrix-org/complement/client"
11+
"github.com/matrix-org/complement/config"
1112
"github.com/matrix-org/complement/ct"
1213
"github.com/matrix-org/complement/helpers"
13-
"github.com/matrix-org/complement/internal/config"
1414
"github.com/matrix-org/gomatrixserverlib"
1515
)
1616

internal/web/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/gorilla/mux"
1010

11-
"github.com/matrix-org/complement/internal/config"
11+
"github.com/matrix-org/complement/config"
1212
)
1313

1414
type Server struct {

test_package.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
"github.com/matrix-org/complement/b"
1313
"github.com/matrix-org/complement/client"
14+
"github.com/matrix-org/complement/config"
1415
"github.com/matrix-org/complement/ct"
1516
"github.com/matrix-org/complement/helpers"
16-
"github.com/matrix-org/complement/internal/config"
1717
"github.com/matrix-org/complement/internal/docker"
1818
"github.com/sirupsen/logrus"
1919
)

0 commit comments

Comments
 (0)