From 3f285cd5d0cffa6a85f5b47d4b657caaa39474a6 Mon Sep 17 00:00:00 2001
From: Todd Knight <T.Alan.Knight@gmail.com>
Date: Tue, 28 Apr 2020 11:29:52 -0700
Subject: [PATCH] Removing placeholder files and creating the error proto.

---
 buf.yaml                                         |  1 +
 .../controller/api/resource/v1/placeholder.proto | 12 ------------
 .../proto}/local/controller/api/v1/error.proto   |  0
 .../controller/api/v1/placeholder_service.proto  | 16 ----------------
 .../controller/storage/v1/placeholder.proto      | 11 -----------
 5 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 internal/proto/local/controller/api/resource/v1/placeholder.proto
 rename {proto => internal/proto}/local/controller/api/v1/error.proto (100%)
 delete mode 100644 internal/proto/local/controller/api/v1/placeholder_service.proto
 delete mode 100644 internal/proto/local/controller/storage/v1/placeholder.proto

diff --git a/buf.yaml b/buf.yaml
index 62965f0cb0..378ba99181 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -10,6 +10,7 @@ lint:
     - protoc-gen-swagger
     - google
   ignore_only:
+    # These api enums break these lint checks in order to appear nice in swagger.
     ENUM_VALUE_PREFIX:
       - controller/api/view/v1/view.proto
     ENUM_ZERO_VALUE_SUFFIX:
diff --git a/internal/proto/local/controller/api/resource/v1/placeholder.proto b/internal/proto/local/controller/api/resource/v1/placeholder.proto
deleted file mode 100644
index 03ec67d2c5..0000000000
--- a/internal/proto/local/controller/api/resource/v1/placeholder.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-package controller.api.resource.v1;
-
-option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api/resource;resource";
-
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-
-// A Placeholder does nothing but establishes directory organization.
-message Placeholder {
-}
diff --git a/proto/local/controller/api/v1/error.proto b/internal/proto/local/controller/api/v1/error.proto
similarity index 100%
rename from proto/local/controller/api/v1/error.proto
rename to internal/proto/local/controller/api/v1/error.proto
diff --git a/internal/proto/local/controller/api/v1/placeholder_service.proto b/internal/proto/local/controller/api/v1/placeholder_service.proto
deleted file mode 100644
index 269308448d..0000000000
--- a/internal/proto/local/controller/api/v1/placeholder_service.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-package controller.api.v1;
-
-option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/api;api";
-
-import "protoc-gen-swagger/options/annotations.proto";
-import "controller/api/resource/v1/placeholder.proto";
-
-option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
-
-};
-
-// Placeholder Service contains nothing but organization details.
-service PlaceholderService {
-}
diff --git a/internal/proto/local/controller/storage/v1/placeholder.proto b/internal/proto/local/controller/storage/v1/placeholder.proto
deleted file mode 100644
index 4e0749a661..0000000000
--- a/internal/proto/local/controller/storage/v1/placeholder.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-package controller.storage.v1;
-
-option go_package = "github.com/hashicorp/watchtower/internal/gen/controller/storage;storage";
-
-import "google/protobuf/timestamp.proto";
-
-// A placeholder is empty to capture the directory structure for storage focused protos.
-message Placeholder {
-}