From 18dfbc0569a5d427a0a0af38bccd8fdf1f721c9c Mon Sep 17 00:00:00 2001 From: mya Date: Thu, 28 Dec 2023 17:45:50 -0600 Subject: [PATCH] fix: collapse packaging --- .gitignore | 1 + LICENSE | 15 +++++++++++++++ Makefile | 7 +++++++ .../v1/service.proto | 6 +++++- legal/header.txt | 2 ++ {licensing/licenses => licenses}/v1/service.proto | 6 +++++- {licensing/packages => packages}/v1/service.proto | 6 +++++- {licensing/products => products}/v1/service.proto | 6 +++++- {licensing/users => users}/v1/service.proto | 6 +++++- 9 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 Makefile rename {licensing/contributors => contributors}/v1/service.proto (78%) create mode 100644 legal/header.txt rename {licensing/licenses => licenses}/v1/service.proto (78%) rename {licensing/packages => packages}/v1/service.proto (78%) rename {licensing/products => products}/v1/service.proto (78%) rename {licensing/users => users}/v1/service.proto (85%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f11b75 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..12d013f --- /dev/null +++ b/LICENSE @@ -0,0 +1,15 @@ +The MIT License (MIT) + +Copyright (c) 2023 The Licensing Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0d56371 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +lint: + buf lint + addlicense -check -f ./legal/header.txt -skip yaml -skip yml -skip xml . + +legal: .legal +.legal: + addlicense -f ./legal/header.txt -skip yaml -skip yml -skip xml . diff --git a/licensing/contributors/v1/service.proto b/contributors/v1/service.proto similarity index 78% rename from licensing/contributors/v1/service.proto rename to contributors/v1/service.proto index 49b2d5c..d8387c5 100644 --- a/licensing/contributors/v1/service.proto +++ b/contributors/v1/service.proto @@ -1,12 +1,16 @@ +// Copyright (C) 2023 The Licensing Authors +// SPDX-License-Identifier: MIT + // // This file attempts to follow common styles and design patterns described by // Google Cloud based on their extensive use of protocol buffers. // // - See here for more: https://cloud.google.com/apis/design/design_patterns // + syntax = "proto3"; -package licensing.contributors.v1; +package contributors.v1; option go_package = "code.pitz.tech/licensing/api-go/contributors/v1;contributorsv1"; diff --git a/legal/header.txt b/legal/header.txt new file mode 100644 index 0000000..f948fe3 --- /dev/null +++ b/legal/header.txt @@ -0,0 +1,2 @@ +Copyright (C) {{ .Year }} The Licensing Authors +SPDX-License-Identifier: MIT diff --git a/licensing/licenses/v1/service.proto b/licenses/v1/service.proto similarity index 78% rename from licensing/licenses/v1/service.proto rename to licenses/v1/service.proto index ece7060..65e3729 100644 --- a/licensing/licenses/v1/service.proto +++ b/licenses/v1/service.proto @@ -1,12 +1,16 @@ +// Copyright (C) 2023 The Licensing Authors +// SPDX-License-Identifier: MIT + // // This file attempts to follow common styles and design patterns described by // Google Cloud based on their extensive use of protocol buffers. // // - See here for more: https://cloud.google.com/apis/design/design_patterns // + syntax = "proto3"; -package licensing.licenses.v1; +package licenses.v1; option go_package = "code.pitz.tech/licensing/api-go/licenses/v1;licensesv1"; diff --git a/licensing/packages/v1/service.proto b/packages/v1/service.proto similarity index 78% rename from licensing/packages/v1/service.proto rename to packages/v1/service.proto index 195cc59..d5285fa 100644 --- a/licensing/packages/v1/service.proto +++ b/packages/v1/service.proto @@ -1,12 +1,16 @@ +// Copyright (C) 2023 The Licensing Authors +// SPDX-License-Identifier: MIT + // // This file attempts to follow common styles and design patterns described by // Google Cloud based on their extensive use of protocol buffers. // // - See here for more: https://cloud.google.com/apis/design/design_patterns // + syntax = "proto3"; -package licensing.packages.v1; +package packages.v1; option go_package = "code.pitz.tech/licensing/api-go/packages/v1;packagesv1"; diff --git a/licensing/products/v1/service.proto b/products/v1/service.proto similarity index 78% rename from licensing/products/v1/service.proto rename to products/v1/service.proto index 3f3115e..0c2e843 100644 --- a/licensing/products/v1/service.proto +++ b/products/v1/service.proto @@ -1,12 +1,16 @@ +// Copyright (C) 2023 The Licensing Authors +// SPDX-License-Identifier: MIT + // // This file attempts to follow common styles and design patterns described by // Google Cloud based on their extensive use of protocol buffers. // // - See here for more: https://cloud.google.com/apis/design/design_patterns // + syntax = "proto3"; -package licensing.products.v1; +package products.v1; option go_package = "code.pitz.tech/licensing/api-go/products/v1;productsv1"; diff --git a/licensing/users/v1/service.proto b/users/v1/service.proto similarity index 85% rename from licensing/users/v1/service.proto rename to users/v1/service.proto index 90401fa..5450493 100644 --- a/licensing/users/v1/service.proto +++ b/users/v1/service.proto @@ -1,12 +1,16 @@ +// Copyright (C) 2023 The Licensing Authors +// SPDX-License-Identifier: MIT + // // This file attempts to follow common styles and design patterns described by // Google Cloud based on their extensive use of protocol buffers. // // - See here for more: https://cloud.google.com/apis/design/design_patterns // + syntax = "proto3"; -package licensing.users.v1; +package users.v1; option go_package = "code.pitz.tech/licensing/api-go/users/v1;usersv1";