Skip to content

Commit

Permalink
go fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
abuchanan-airbyte committed Sep 20, 2024
1 parent 97b7908 commit 7d49835
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 21 deletions.
6 changes: 3 additions & 3 deletions internal/cmd/local/docker/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
func Secret(server, user, pass, email string) ([]byte, error) {
// map of the server to the credentials
return json.Marshal(map[string]any{
"auths": map[string]any {
server: map[string]any {
"auths": map[string]any{
server: map[string]any{
"username": user,
"password": pass,
"email": email,
"auth": base64.StdEncoding.EncodeToString([]byte(user + ":" + pass)),
},
},
})
}
}
2 changes: 1 addition & 1 deletion internal/cmd/local/k8s/k8stest/k8stest.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type MockClient struct {
FnEventsWatch func(ctx context.Context, namespace string) (watch.Interface, error)
FnLogsGet func(ctx context.Context, namespace string, name string) (string, error)
FnStreamPodLogs func(ctx context.Context, namespace, podName string, since time.Time) (io.ReadCloser, error)
FnPodList func(ctx context.Context, namespace string) (*corev1.PodList, error)
FnPodList func(ctx context.Context, namespace string) (*corev1.PodList, error)
}

func (m *MockClient) DeploymentList(ctx context.Context, namespace string) (*v1.DeploymentList, error) {
Expand Down
22 changes: 11 additions & 11 deletions internal/cmd/local/local/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ import (

const (
airbyteBootloaderPodName = "airbyte-abctl-airbyte-bootloader"
airbyteChartName = "airbyte/airbyte"
airbyteChartRelease = "airbyte-abctl"
airbyteIngress = "ingress-abctl"
airbyteNamespace = "airbyte-abctl"
airbyteRepoName = "airbyte"
airbyteRepoURL = "https://airbytehq.github.io/helm-charts"
nginxChartName = "nginx/ingress-nginx"
nginxChartRelease = "ingress-nginx"
nginxNamespace = "ingress-nginx"
nginxRepoName = "nginx"
nginxRepoURL = "https://kubernetes.github.io/ingress-nginx"
airbyteChartName = "airbyte/airbyte"
airbyteChartRelease = "airbyte-abctl"
airbyteIngress = "ingress-abctl"
airbyteNamespace = "airbyte-abctl"
airbyteRepoName = "airbyte"
airbyteRepoURL = "https://airbytehq.github.io/helm-charts"
nginxChartName = "nginx/ingress-nginx"
nginxChartRelease = "ingress-nginx"
nginxNamespace = "ingress-nginx"
nginxRepoName = "nginx"
nginxRepoURL = "https://kubernetes.github.io/ingress-nginx"
)

// dockerAuthSecretName is the name of the secret which holds the docker authentication information.
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/local/local/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ func determineHelmChartAction(helm helm.Client, chart *chart.Chart, releaseName
// values provided were potentially overridden by the valuesYML file.
func mergeValuesWithValuesYAML(values []string, userValues map[string]any) (string, error) {
a := maps.FromSlice(values)

maps.Merge(a, userValues)

res, err := maps.ToYAML(a)
Expand Down
4 changes: 1 addition & 3 deletions internal/cmd/local/local/log_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestJavaLogScanner(t *testing.T) {

expectLogLine := func(level, msg string) {
s.Scan()

if s.line.level != level {
t.Errorf("expected level %q but got %q", level, s.line.level)
}
Expand Down Expand Up @@ -58,5 +58,3 @@ func TestLastErrorLog(t *testing.T) {
t.Errorf("expected %q but got %q", expect, l)
}
}


2 changes: 1 addition & 1 deletion internal/cmd/local/local/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ func (c *Command) Status(_ context.Context) error {
pterm.Info.Println(fmt.Sprintf("Airbyte should be accessible via http://localhost:%d", c.portHTTP))

return nil
}
}
1 change: 0 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func main() {

func run(ctx context.Context) error {


var root cmd.Cmd
parser, err := kong.New(
&root,
Expand Down

0 comments on commit 7d49835

Please sign in to comment.