From 4f8d148c1ea6dab5b6dc3fe012eb8989c2aacf96 Mon Sep 17 00:00:00 2001
From: Todd Knight <T.Alan.Knight@gmail.com>
Date: Tue, 14 Apr 2020 13:49:15 -0700
Subject: [PATCH] Minor fixing of newlines at end of files and updating link of
 copied bash script.

---
 Makefile                                       |  2 +-
 buf.yaml                                       |  2 +-
 gen/controller.swagger.json                    | 12 ++++++------
 make/protoc_gen_plugin.bash                    |  4 ++--
 proto/local/controller/api/v1/error.proto      |  2 +-
 .../controller/resource/v1/ec2catalog.proto    |  1 -
 tools/tools.go                                 | 18 ++++++++----------
 7 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index f44c3ef837..b69b24fdcf 100644
--- a/Makefile
+++ b/Makefile
@@ -40,4 +40,4 @@ cleanup:
 
 .PHONY: proto
 
-.NOTPARALLEL:
\ No newline at end of file
+.NOTPARALLEL:
diff --git a/buf.yaml b/buf.yaml
index 1f2e85bf7f..f32e6bade6 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -11,4 +11,4 @@ lint:
     - protoc-gen-swagger
     - google
     # TODO: Remove once the proto files under oplog are compliant with the linter.
-    - oplog
\ No newline at end of file
+    - oplog
diff --git a/gen/controller.swagger.json b/gen/controller.swagger.json
index 79f785c18b..101a11411e 100644
--- a/gen/controller.swagger.json
+++ b/gen/controller.swagger.json
@@ -18,7 +18,7 @@
   "paths": {
     "/v1/ec2_catalogs": {
       "get": {
-        "operationId": "ListEc2Catalogs",
+        "operationId": "ControllerService_ListEc2Catalogs",
         "responses": {
           "200": {
             "description": "A successful response.",
@@ -48,7 +48,7 @@
         ]
       },
       "post": {
-        "operationId": "CreateEc2Catalog",
+        "operationId": "ControllerService_CreateEc2Catalog",
         "responses": {
           "200": {
             "description": "",
@@ -80,7 +80,7 @@
     },
     "/v1/ec2_catalogs/{catalog.id}": {
       "patch": {
-        "operationId": "UpdateEc2Catalog",
+        "operationId": "ControllerService_UpdateEc2Catalog",
         "responses": {
           "200": {
             "description": "A successful response.",
@@ -119,7 +119,7 @@
     },
     "/v1/ec2_catalogs/{id}": {
       "get": {
-        "operationId": "GetEc2Catalog",
+        "operationId": "ControllerService_GetEc2Catalog",
         "responses": {
           "200": {
             "description": "",
@@ -148,7 +148,7 @@
         ]
       },
       "delete": {
-        "operationId": "DeleteEc2Catalog",
+        "operationId": "ControllerService_DeleteEc2Catalog",
         "responses": {
           "200": {
             "description": "A successful response.",
@@ -178,7 +178,7 @@
     },
     "/v1/ec2_catalogs/{id}:rotate": {
       "post": {
-        "operationId": "RotateEc2CatalogAccessKey",
+        "operationId": "ControllerService_RotateEc2CatalogAccessKey",
         "responses": {
           "200": {
             "description": "A successful response.",
diff --git a/make/protoc_gen_plugin.bash b/make/protoc_gen_plugin.bash
index aa13f9237e..9cb3e78052 100644
--- a/make/protoc_gen_plugin.bash
+++ b/make/protoc_gen_plugin.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copied with minor changes from Makego at https://github.com/bufbuild/buf/blob/master/make/go/scripts/protoc_gen_plugin.bash
+# Copied with minor changes from Makego at https://github.com/bufbuild/makego/blob/master/make/go/scripts/protoc_gen_plugin.bash
 
 set -eo pipefail
 
@@ -86,4 +86,4 @@ for proto_path in "${PROTO_PATHS[@]}"; do
     echo protoc "${PROTOC_FLAGS[@]}" $(find "${dir}" -name '*.proto')
     protoc "${PROTOC_FLAGS[@]}" $(find "${dir}" -name '*.proto')
   done
-done
\ No newline at end of file
+done
diff --git a/proto/local/controller/api/v1/error.proto b/proto/local/controller/api/v1/error.proto
index 98cfa2d357..f45fc82b69 100644
--- a/proto/local/controller/api/v1/error.proto
+++ b/proto/local/controller/api/v1/error.proto
@@ -19,4 +19,4 @@ message Error {
     string message = 3;
     // Additional metadata regarding the error.  Depending on the error different fields will be populated.
     ErrorDetails details = 4;
-}
\ No newline at end of file
+}
diff --git a/proto/local/controller/resource/v1/ec2catalog.proto b/proto/local/controller/resource/v1/ec2catalog.proto
index cd87202770..33fa907f53 100644
--- a/proto/local/controller/resource/v1/ec2catalog.proto
+++ b/proto/local/controller/resource/v1/ec2catalog.proto
@@ -17,4 +17,3 @@ message Ec2Catalog {
     google.protobuf.Timestamp created_time = 7;
     google.protobuf.Timestamp updated_time = 8;
 }
-
diff --git a/tools/tools.go b/tools/tools.go
index 5888c16531..32e649c277 100644
--- a/tools/tools.go
+++ b/tools/tools.go
@@ -1,15 +1,13 @@
 // +build tools
 
-/*
-	This file ensures tool dependencies are kept in sync.  This is the recommended way of doing this according to
-   https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
-
-	To update the versions used by this repo use.
-	% go mod tidy
-
-   To install the following tools at the version used by this repo run
-   % go install (each of the dependencies listed below)
-*/
+// 	This file ensures tool dependencies are kept in sync.  This is the recommended way of doing this according to
+//  https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
+//
+// 	To update the versions used by this repo use.
+// 	% go mod tidy
+//
+//  To install the following tools at the version used by this repo run
+//  % go install (each of the dependencies listed below)
 
 package tools