Skip to content

Commit 0b435c1

Browse files
arschlesAaron Schlesinger
authored andcommitted
fix(gitreceive/config.go,sshd/config.go): make configs required and of the correct name
1 parent ecdb5b1 commit 0b435c1

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

pkg/gitreceive/config.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ import (
66

77
type Config struct {
88
// k8s service discovery env vars
9-
WorkflowHost string `envconfig:"deis_workflow_service_host"`
10-
WorkflowPort string `envconfig:"deis_workflow_service_port"`
11-
RegistryHost string `envconfig:"deis_registry_service_host"`
12-
RegistryPort string `envconfig:"deis_registry_service_port"`
9+
WorkflowHost string `envconfig:"DEIS_WORKFLOW_SERVICE_HOST" required:"true"`
10+
WorkflowPort string `envconfig:"DEIS_WORKFLOW_SERVICE_PORT" required:"true"`
11+
RegistryHost string `envconfig:"DEIS_REGISTRY_SERVICE_HOST" required:"true"`
12+
RegistryPort string `envconfig:"DEIS_REGISTRY_SERVICE_PORT" required:"true"`
1313

14-
GitHome string `envconfig:"git_home"`
15-
SSHConnection string `envconfig:"ssh_connection"`
16-
SSHOriginalCommand string `envconfig:"ssh_original_command"`
17-
Repository string `envconfig:"repository"`
18-
SHA string `envconfing:"sha"`
19-
Username string `envconfig:"username"`
20-
Fingerprint string `envconfing:"fingerprint"`
21-
PodNamespace string `envconfig:"pod_namespace"`
14+
GitHome string `envconfig:"GIT_HOME" required:"true"`
15+
SSHConnection string `envconfig:"SSH_CONNECTION" required:"true"`
16+
SSHOriginalCommand string `envconfig:"SSH_ORIGINAL_COMMAND" required:"true"`
17+
Repository string `envconfig:"REPOSITORY" required:"true"`
18+
SHA string `envconfing:"SHA" required:"true"`
19+
Username string `envconfig:"USERNAME" required:"true"`
20+
Fingerprint string `envconfing:"FINGERPRINT" required:"true"`
21+
PodNamespace string `envconfig:"POD_NAMESPACE" required:"true"`
2222
}
2323

2424
func (c Config) App() string {

pkg/sshd/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sshd
22

33
type Config struct {
4-
FetcherPort int `envconfig:"fetcher_port" default:"3000"`
5-
SSHHostIP string `envconfig:"ssh_host_ip" default:"0.0.0.0"`
6-
SSHHostPort int `envconfig:"ssh_host_port" default:"2223"`
4+
FetcherPort int `envconfig:"FETCHER_PORT" default:"3000" required:"true"`
5+
SSHHostIP string `envconfig:"SSH_HOST_IP" default:"0.0.0.0" required:"true"`
6+
SSHHostPort int `envconfig:"SSH_HOST_PORT" default:"2223" required:"true"`
77
}

0 commit comments

Comments
 (0)