Skip to content

Fix gofmt across repo #181

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
openshift-merge-robot merged 1 commit into from
Aug 26, 2018
Merged

Fix gofmt across repo #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions installer/pkg/config/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ const (

// AWS converts AWS related config.
type AWS struct {
EC2AMIOverride string `json:"tectonic_aws_ec2_ami_override,omitempty" yaml:"ec2AMIOverride,omitempty"`
Endpoints Endpoints `json:"tectonic_aws_endpoints,omitempty" yaml:"endpoints,omitempty"`
Etcd `json:",inline" yaml:"etcd,omitempty"`
External `json:",inline" yaml:"external,omitempty"`
ExtraTags map[string]string `json:"tectonic_aws_extra_tags,omitempty" yaml:"extraTags,omitempty"`
InstallerRole string `json:"tectonic_aws_installer_role,omitempty" yaml:"installerRole,omitempty"`
Master `json:",inline" yaml:"master,omitempty"`
Profile string `json:"tectonic_aws_profile,omitempty" yaml:"profile,omitempty"`
Region string `json:"tectonic_aws_region,omitempty" yaml:"region,omitempty"`
VPCCIDRBlock string `json:"tectonic_aws_vpc_cidr_block,omitempty" yaml:"vpcCIDRBlock,omitempty"`
Worker `json:",inline" yaml:"worker,omitempty"`
EC2AMIOverride string `json:"tectonic_aws_ec2_ami_override,omitempty" yaml:"ec2AMIOverride,omitempty"`
Endpoints Endpoints `json:"tectonic_aws_endpoints,omitempty" yaml:"endpoints,omitempty"`
Etcd `json:",inline" yaml:"etcd,omitempty"`
External `json:",inline" yaml:"external,omitempty"`
ExtraTags map[string]string `json:"tectonic_aws_extra_tags,omitempty" yaml:"extraTags,omitempty"`
InstallerRole string `json:"tectonic_aws_installer_role,omitempty" yaml:"installerRole,omitempty"`
Master `json:",inline" yaml:"master,omitempty"`
Profile string `json:"tectonic_aws_profile,omitempty" yaml:"profile,omitempty"`
Region string `json:"tectonic_aws_region,omitempty" yaml:"region,omitempty"`
VPCCIDRBlock string `json:"tectonic_aws_vpc_cidr_block,omitempty" yaml:"vpcCIDRBlock,omitempty"`
Worker `json:",inline" yaml:"worker,omitempty"`
}

// External converts external related config.
Expand Down
2 changes: 1 addition & 1 deletion installer/pkg/config/libvirt/libvirt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type Libvirt struct {
MasterIPs []string `json:"tectonic_libvirt_master_ips,omitempty" yaml:"masterIPs"`
WorkerIPs []string `json:"tectonic_libvirt_worker_ips,omitempty" yaml:"workerIPs"`
EtcdIPs []string `json:"tectonic_libvirt_etcd_ips,omitempty" yaml:"etcdIPs"`
BootstrapIP string `json:"tectonic_libvirt_bootstrap_ip,omitempty" yaml:"bootstrapIP"`
BootstrapIP string `json:"tectonic_libvirt_bootstrap_ip,omitempty" yaml:"bootstrapIP"`
}

// Network describes a libvirt network configuration.
Expand Down
2 changes: 1 addition & 1 deletion installer/pkg/workflow/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func TestGenerateTerraformVariablesStep(t *testing.T) {
}
expected := string(expectedData)

if got + "\n" != expected {
if got+"\n" != expected {
t.Errorf("expected: %s, got: %s", expected, got)
}
}
Expand Down
16 changes: 8 additions & 8 deletions pkg/asset/installconfig/installconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,28 +120,28 @@ func TestInstallConfigGenerate(t *testing.T) {
}

states := map[asset.Asset]*asset.State{
stock.clusterID: &asset.State{
stock.clusterID: {
Contents: []asset.Content{{Data: []byte("test-cluster-id")}},
},
stock.emailAddress: &asset.State{
stock.emailAddress: {
Contents: []asset.Content{{Data: []byte("test-email")}},
},
stock.password: &asset.State{
stock.password: {
Contents: []asset.Content{{Data: []byte("test-password")}},
},
stock.baseDomain: &asset.State{
stock.baseDomain: {
Contents: []asset.Content{{Data: []byte("test-domain")}},
},
stock.clusterName: &asset.State{
stock.clusterName: {
Contents: []asset.Content{{Data: []byte("test-cluster-name")}},
},
stock.license: &asset.State{
stock.license: {
Contents: []asset.Content{{Data: []byte("test-license")}},
},
stock.pullSecret: &asset.State{
stock.pullSecret: {
Contents: []asset.Content{{Data: []byte("test-pull-secret")}},
},
stock.platform: &asset.State{
stock.platform: {
Contents: make([]asset.Content, len(tc.platformContents)),
},
}
Expand Down