added swagger docs and verified the gofmt

Author: JacobTanenbaum

pkg/cmd/server/origin/master_config.go

@@ -69,6 +69,7 @@ import (
 	imageadmission "github.com/openshift/origin/pkg/image/admission"
 	imagepolicy "github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
 	imageapi "github.com/openshift/origin/pkg/image/api"
+	ingressadmit "github.com/openshift/origin/pkg/ingress/admission"
 	accesstokenregistry "github.com/openshift/origin/pkg/oauth/registry/oauthaccesstoken"
 	accesstokenetcd "github.com/openshift/origin/pkg/oauth/registry/oauthaccesstoken/etcd"
 	projectauth "github.com/openshift/origin/pkg/project/auth"
@@ -79,7 +80,6 @@ import (
 	"github.com/openshift/origin/pkg/quota/controller/clusterquotamapping"
 	"github.com/openshift/origin/pkg/service"
 	serviceadmit "github.com/openshift/origin/pkg/service/admission"
-	ingressadmit "github.com/openshift/origin/pkg/ingress/admission"
 	"github.com/openshift/origin/pkg/serviceaccounts"
 	usercache "github.com/openshift/origin/pkg/user/cache"
 	groupregistry "github.com/openshift/origin/pkg/user/registry/group"

pkg/ingress/admission/api/types.go

@@ -5,15 +5,15 @@ import (
 )
 
 // IngressAdmissionConfig is the configuration for the the ingress
-// controller limiter plugin. It changes the behavior of ingress 
+// controller limiter plugin. It changes the behavior of ingress
 //objects to behave better with openshift routes and routers.
-//*NOTE* Disabling this plugin causes ingress objects to behave 
+//*NOTE* Disabling this plugin causes ingress objects to behave
 //the same as in upstream kubernetes
 type IngressAdmissionConfig struct {
 	unversioned.TypeMeta
 
-	//UpstreamHostnameUpdate when true causes updates that attempt 
-	//to add or modify hostnames to succeed. Otherwise those updates 
-	//fail in order to ensure hostname behavior 
+	//UpstreamHostnameUpdate when true causes updates that attempt
+	//to add or modify hostnames to succeed. Otherwise those updates
+	//fail in order to ensure hostname behavior
 	UpstreamHostnameUpdate bool
 }

pkg/ingress/admission/api/v1/defaults_test.go

@@ -12,12 +12,11 @@ import (
 	_ "github.com/openshift/origin/pkg/ingress/admission/api/install"
 
 	ingressv1 "github.com/openshift/origin/pkg/ingress/admission/api/v1"
-
 )
 
 func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
 	data, err := runtime.Encode(configapi.Codecs.LegacyCodec(v1.SchemeGroupVersion), obj)
-	if  err != nil {
+	if err != nil {
 		t.Errorf("%v\n %#v", err, obj)
 		return nil
 	}

pkg/ingress/admission/api/v1/swagger_doc.go

@@ -0,0 +1,15 @@
+package v1
+
+// This file contains methods that can be used by the go-restful package to generate Swagger
+// documentation for the object types found in 'types.go' This file is automatically generated
+// by hack/update-generated-swagger-descriptions.sh and should be run after a full build of OpenShift.
+// ==== DO NOT EDIT THIS FILE MANUALLY ====
+
+var map_IngressAdmissionConfig = map[string]string{
+	"": "IngressAdmissionConfig is the configuration for the the ingress controller limiter plugin. It changes the behavior of ingress objects to behave better with openshift routes and routers. *NOTE* Disabling this plugin causes ingress objects to behave the same as in upstream kubernetes",
+	"upstreamHostnameUpdate": "UpstreamHostnameUpdate when true causes updates that attempt to add or modify hostnames to succeed. Otherwise those updates fail in order to ensure hostname behavior",
+}
+
+func (IngressAdmissionConfig) SwaggerDoc() map[string]string {
+	return map_IngressAdmissionConfig
+}

pkg/ingress/admission/api/v1/types.go

@@ -5,16 +5,15 @@ import (
 )
 
 // IngressAdmissionConfig is the configuration for the the ingress
-// controller limiter plugin. It changes the behavior of ingress 
+// controller limiter plugin. It changes the behavior of ingress
 //objects to behave better with openshift routes and routers.
-//*NOTE* Disabling this plugin causes ingress objects to behave 
+//*NOTE* Disabling this plugin causes ingress objects to behave
 //the same as in upstream kubernetes
 type IngressAdmissionConfig struct {
 	unversioned.TypeMeta `json:",inline"`
 
 	//UpstreamHostnameUpdate when true causes updates that attempt
-	//to add or modify hostnames to succeed. Otherwise those updates 
-	//fail in order to ensure hostname behavior 
+	//to add or modify hostnames to succeed. Otherwise those updates
+	//fail in order to ensure hostname behavior
 	UpstreamHostnameUpdate bool `json:"upstreamHostnameUpdate", description:"set to true to disable openshift protections and enable kubernetes style ingress objects"`
-
 }

pkg/ingress/admission/ingress_admission.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"reflect"
 
-
 	kadmission "k8s.io/kubernetes/pkg/admission"
 	kextensions "k8s.io/kubernetes/pkg/apis/extensions"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -35,11 +34,10 @@ type ingressAdmission struct {
 	config *api.IngressAdmissionConfig
 }
 
-
 func NewIngressAdmission(config *api.IngressAdmissionConfig) *ingressAdmission {
 	return &ingressAdmission{
-		Handler:               kadmission.NewHandler(kadmission.Create, kadmission.Update),
-		config: config,
+		Handler: kadmission.NewHandler(kadmission.Create, kadmission.Update),
+		config:  config,
 	}
 }
 
@@ -62,9 +60,9 @@ func readConfig(reader io.Reader) (*api.IngressAdmissionConfig, error) {
 	return config, nil
 }
 
-func (r *ingressAdmission) Admit( a kadmission.Attributes) error {
+func (r *ingressAdmission) Admit(a kadmission.Attributes) error {
 	if a.GetResource().GroupResource() == kextensions.Resource("ingresses") && a.GetOperation() == kadmission.Update {
-		if (r.config == nil || r.config.UpstreamHostnameUpdate == false) {
+		if r.config == nil || r.config.UpstreamHostnameUpdate == false {
 			oldIngress, ok := a.GetOldObject().(*kextensions.Ingress)
 			if !ok {
 				return nil

pkg/ingress/admission/ingress_admission_test.go

@@ -10,61 +10,61 @@ import (
 	"github.com/openshift/origin/pkg/ingress/admission/api"
 )
 
-func TestAdmission( t *testing.T) {
+func TestAdmission(t *testing.T) {
 
 	var newIngress *kextensions.Ingress
 	var oldIngress *kextensions.Ingress
 
 	tests := []struct {
-		config *api.IngressAdmissionConfig
-		testName	string
+		config           *api.IngressAdmissionConfig
+		testName         string
 		oldHost, newHost string
-		op		admission.Operation
-		admit		bool
+		op               admission.Operation
+		admit            bool
 	}{
 		{
-			admit: true,
-			config: emptyConfig(),
-			op: admission.Create,
+			admit:    true,
+			config:   emptyConfig(),
+			op:       admission.Create,
 			testName: "No errors on create",
 		},
 		{
-			admit: true,
-			config: emptyConfig(),
-			op: admission.Update,
-			newHost: "foo.com",
-			oldHost: "foo.com",
+			admit:    true,
+			config:   emptyConfig(),
+			op:       admission.Update,
+			newHost:  "foo.com",
+			oldHost:  "foo.com",
 			testName: "keeping the host the same should pass",
 		},
 		{
-			admit: true,
-			config: emptyConfig(),
-			op: admission.Update,
-			oldHost: "foo.com",
+			admit:    true,
+			config:   emptyConfig(),
+			op:       admission.Update,
+			oldHost:  "foo.com",
 			testName: "deleting a hostname should pass",
 		},
 		{
-			admit: false,
-			config: emptyConfig(),
-			op: admission.Update,
-			newHost: "foo.com",
-			oldHost: "bar.com",
+			admit:    false,
+			config:   emptyConfig(),
+			op:       admission.Update,
+			newHost:  "foo.com",
+			oldHost:  "bar.com",
 			testName: "changing hostname should fail",
 		},
 		{
-			admit: false,
-			config: nil,
-			op: admission.Update,
-			newHost: "foo.com",
-			oldHost: "bar.com",
+			admit:    false,
+			config:   nil,
+			op:       admission.Update,
+			newHost:  "foo.com",
+			oldHost:  "bar.com",
 			testName: "unconfigured plugin should still fail",
 		},
 		{
-			admit: true,
-			config: testConfigUpdateAllow(),
-			op: admission.Update,
-			newHost: "foo.com",
-			oldHost: "bar.com",
+			admit:    true,
+			config:   testConfigUpdateAllow(),
+			op:       admission.Update,
+			newHost:  "foo.com",
+			oldHost:  "bar.com",
 			testName: "Upstream Hostname updates enabled",
 		},
 	}
@@ -84,7 +84,7 @@ func TestAdmission( t *testing.T) {
 			//Used to test deleteing a hostname
 			newIngress = &kextensions.Ingress{
 				ObjectMeta: kapi.ObjectMeta{Name: "test"},
-				}
+			}
 		}
 		handler := NewIngressAdmission(test.config)