From bf6a5c67ed357fae8c57ad34e26465995487406c Mon Sep 17 00:00:00 2001 From: Artsiom Koltun Date: Thu, 18 Jan 2024 12:31:11 +0100 Subject: [PATCH] refactor: remove common as unused Signed-off-by: Artsiom Koltun --- .github/workflows/inventory-skip.yml | 4 - .github/workflows/inventory.yml | 4 - .github/workflows/network-skip.yml | 4 - .github/workflows/network.yml | 4 - .github/workflows/security-skip.yml | 4 - .github/workflows/security.yml | 4 - .github/workflows/storage-skip.yml | 4 - .github/workflows/storage.yml | 4 - buf.work.yaml | 1 - common/Makefile | 28 - common/buf.lock | 13 - common/buf.yaml | 8 - common/v1/__init__.py | 0 common/v1/autogen.md | 64 -- common/v1/gen/__init__.py | 0 common/v1/gen/cpp/uuid.grpc.pb.cc | 29 - common/v1/gen/cpp/uuid.grpc.pb.h | 42 -- common/v1/gen/cpp/uuid.pb.cc | 303 --------- common/v1/gen/cpp/uuid.pb.h | 290 --------- common/v1/gen/go/uuid.pb.go | 153 ----- common/v1/gen/go/uuid.swagger.json | 46 -- .../v1/gen/java/opi_api/common/v1/Uuid.java | 597 ------------------ .../java/opi_api/common/v1/UuidOrBuilder.java | 29 - .../gen/java/opi_api/common/v1/UuidProto.java | 49 -- common/v1/gen/python/__init__.py | 0 common/v1/gen/python/uuid_pb2.py | 26 - common/v1/gen/python/uuid_pb2_grpc.py | 4 - common/v1/uuid.proto | 19 - inventory/README.md | 6 +- network/cloud/Makefile | 6 +- network/evpn-gw/Makefile | 6 +- network/opinetcommon/Makefile | 6 +- security/Makefile | 6 +- storage/README.md | 6 +- 34 files changed, 18 insertions(+), 1751 deletions(-) delete mode 100644 common/Makefile delete mode 100644 common/buf.lock delete mode 100644 common/buf.yaml delete mode 100644 common/v1/__init__.py delete mode 100644 common/v1/autogen.md delete mode 100644 common/v1/gen/__init__.py delete mode 100644 common/v1/gen/cpp/uuid.grpc.pb.cc delete mode 100644 common/v1/gen/cpp/uuid.grpc.pb.h delete mode 100644 common/v1/gen/cpp/uuid.pb.cc delete mode 100644 common/v1/gen/cpp/uuid.pb.h delete mode 100644 common/v1/gen/go/uuid.pb.go delete mode 100644 common/v1/gen/go/uuid.swagger.json delete mode 100644 common/v1/gen/java/opi_api/common/v1/Uuid.java delete mode 100644 common/v1/gen/java/opi_api/common/v1/UuidOrBuilder.java delete mode 100644 common/v1/gen/java/opi_api/common/v1/UuidProto.java delete mode 100644 common/v1/gen/python/__init__.py delete mode 100644 common/v1/gen/python/uuid_pb2.py delete mode 100644 common/v1/gen/python/uuid_pb2_grpc.py delete mode 100644 common/v1/uuid.proto diff --git a/.github/workflows/inventory-skip.yml b/.github/workflows/inventory-skip.yml index c4e1c170..27c9c5de 100644 --- a/.github/workflows/inventory-skip.yml +++ b/.github/workflows/inventory-skip.yml @@ -5,16 +5,12 @@ on: push: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'inventory/v1/**' - 'inventory/Makefile' - '.github/workflows/inventory.yml' pull_request: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'inventory/v1/**' - 'inventory/Makefile' - '.github/workflows/inventory.yml' diff --git a/.github/workflows/inventory.yml b/.github/workflows/inventory.yml index 591b0e2d..544b739f 100644 --- a/.github/workflows/inventory.yml +++ b/.github/workflows/inventory.yml @@ -6,16 +6,12 @@ on: push: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'inventory/v1/**' - 'inventory/Makefile' - '.github/workflows/inventory.yml' pull_request: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'inventory/v1/**' - 'inventory/Makefile' - '.github/workflows/inventory.yml' diff --git a/.github/workflows/network-skip.yml b/.github/workflows/network-skip.yml index 208c6e63..ab76abef 100644 --- a/.github/workflows/network-skip.yml +++ b/.github/workflows/network-skip.yml @@ -5,16 +5,12 @@ on: push: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'network/v1/**' - 'network/Makefile' - '.github/workflows/network.yml' pull_request: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'network/v1/**' - 'network/Makefile' - '.github/workflows/network.yml' diff --git a/.github/workflows/network.yml b/.github/workflows/network.yml index ff4c24b9..674224c9 100644 --- a/.github/workflows/network.yml +++ b/.github/workflows/network.yml @@ -6,16 +6,12 @@ on: push: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'network/v1/**' - 'network/Makefile' - '.github/workflows/network.yml' pull_request: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'network/v1/**' - 'network/Makefile' - '.github/workflows/network.yml' diff --git a/.github/workflows/security-skip.yml b/.github/workflows/security-skip.yml index b04d89ef..a3f34957 100644 --- a/.github/workflows/security-skip.yml +++ b/.github/workflows/security-skip.yml @@ -5,16 +5,12 @@ on: push: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'security/v1/**' - 'security/Makefile' - '.github/workflows/security.yml' pull_request: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'security/v1/**' - 'security/Makefile' - '.github/workflows/security.yml' diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index e6ae5e95..dd8bb31d 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -6,16 +6,12 @@ on: push: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'security/v1/**' - 'security/Makefile' - '.github/workflows/security.yml' pull_request: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'security/v1/**' - 'security/Makefile' - '.github/workflows/security.yml' diff --git a/.github/workflows/storage-skip.yml b/.github/workflows/storage-skip.yml index 746d6b72..782c9088 100644 --- a/.github/workflows/storage-skip.yml +++ b/.github/workflows/storage-skip.yml @@ -5,16 +5,12 @@ on: push: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'storage/v1alpha1/**' - 'storage/Makefile' - '.github/workflows/storage.yml' pull_request: branches: [ main ] paths-ignore: - - 'common/v1/**' - - 'common/Makefile' - 'storage/v1alpha1/**' - 'storage/Makefile' - '.github/workflows/storage.yml' diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 91074ed5..72ad9120 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -6,16 +6,12 @@ on: push: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'storage/v1alpha1/**' - 'storage/Makefile' - '.github/workflows/storage.yml' pull_request: branches: [ main ] paths: - - 'common/v1/**' - - 'common/Makefile' - 'storage/v1alpha1/**' - 'storage/Makefile' - '.github/workflows/storage.yml' diff --git a/buf.work.yaml b/buf.work.yaml index 7fe8a3a5..7246a725 100644 --- a/buf.work.yaml +++ b/buf.work.yaml @@ -1,6 +1,5 @@ version: v1 directories: -- common - inventory - security - storage diff --git a/common/Makefile b/common/Makefile deleted file mode 100644 index 8065f92a..00000000 --- a/common/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (C) 2022 Intel Corporation -# Copyright (c) 2022 Dell Inc, or its subsidiaries. - -all: - rm -rf ./google - rm -rf ./v1/{autogen.md,gen} - mkdir -p ./v1/gen/{go,cpp,python,java} - - # protoc doesn't include the googleapis, so we have to get them here - curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api - - docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v ${PWD}/google/api:/opt/include/google/api namely/protoc-all:1.51_2 --lint -d v1 -l go -o ./v1/gen/go/ --go-source-relative --with-gateway - docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v ${PWD}/google/api:/opt/include/google/api namely/protoc-all:1.51_2 --lint -d v1 -l cpp -o ./v1/gen/cpp/ --go-source-relative - docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v ${PWD}/google/api:/opt/include/google/api namely/protoc-all:1.51_2 --lint -d v1 -l python -o ./v1/gen/python/ --go-source-relative - docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v ${PWD}/google/api:/opt/include/google/api namely/protoc-all:1.51_2 --lint -d v1 -l java -o ./v1/gen/java/ --go-source-relative - - mv google "${PWD}"/v1/ - - docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1/:/out -v "${PWD}"/v1:/protos pseudomuto/protoc-gen-doc:1.5.1 --doc_opt=markdown,autogen.md - docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1/:/out -w /out --entrypoint=sh ghcr.io/docker-multiarch/google-api-linter:1.63.1 -c "api-linter /out/*.proto --output-format summary" - docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1/:/out -w /out --entrypoint=sh ghcr.io/docker-multiarch/google-api-linter:1.63.1 -c "api-linter /out/*.proto --output-format github --set-exit-status" - rm -rf "${PWD}"/v1/google - -buf: - buf lint - buf generate --template ../buf.gen.yaml -o v1 - diff --git a/common/buf.lock b/common/buf.lock deleted file mode 100644 index 2c3ca1c8..00000000 --- a/common/buf.lock +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by buf. DO NOT EDIT. -version: v1 -deps: - - remote: buf.build - owner: googleapis - repository: googleapis - commit: 28151c0d0a1641bf938a7672c500e01d - digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de - - remote: buf.build - owner: grpc-ecosystem - repository: grpc-gateway - commit: f460f71081c14a80b66cc72526e0b322 - digest: shake256:122def85e91fc3ef4ab351680060b8f70e9d09a7ae6d1412aeb2bddfeee5c4d3fc8819da33fef56192cec0a817ac0c3e6d49bb2acf02eb5c9e9131739a60ddfc diff --git a/common/buf.yaml b/common/buf.yaml deleted file mode 100644 index f426f16c..00000000 --- a/common/buf.yaml +++ /dev/null @@ -1,8 +0,0 @@ -version: v1 -name: buf.build/opiproject/common -deps: -- buf.build/googleapis/googleapis -- buf.build/grpc-ecosystem/grpc-gateway -lint: - except: - - PACKAGE_DIRECTORY_MATCH \ No newline at end of file diff --git a/common/v1/__init__.py b/common/v1/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/common/v1/autogen.md b/common/v1/autogen.md deleted file mode 100644 index 7707cfb2..00000000 --- a/common/v1/autogen.md +++ /dev/null @@ -1,64 +0,0 @@ -# Protocol Documentation - - -## Table of Contents - -- [uuid.proto](#uuid-proto) - - [Uuid](#opi_api-common-v1-Uuid) - -- [Scalar Value Types](#scalar-value-types) - - - - -

Top

- -## uuid.proto - - - - - -### Uuid -A universally unique identifier (UUID) is a 128-bit label -When generated according to the standard methods, UUIDs are, for practical purposes, unique. - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| value | [string](#string) | | The value of the UUID | - - - - - - - - - - - - - - - -## Scalar Value Types - -| .proto Type | Notes | C++ | Java | Python | Go | C# | PHP | Ruby | -| ----------- | ----- | --- | ---- | ------ | -- | -- | --- | ---- | -| double | | double | double | float | float64 | double | float | Float | -| float | | float | float | float | float32 | float | float | Float | -| int32 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint32 instead. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) | -| int64 | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint64 instead. | int64 | long | int/long | int64 | long | integer/string | Bignum | -| uint32 | Uses variable-length encoding. | uint32 | int | int/long | uint32 | uint | integer | Bignum or Fixnum (as required) | -| uint64 | Uses variable-length encoding. | uint64 | long | int/long | uint64 | ulong | integer/string | Bignum or Fixnum (as required) | -| sint32 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int32s. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) | -| sint64 | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int64s. | int64 | long | int/long | int64 | long | integer/string | Bignum | -| fixed32 | Always four bytes. More efficient than uint32 if values are often greater than 2^28. | uint32 | int | int | uint32 | uint | integer | Bignum or Fixnum (as required) | -| fixed64 | Always eight bytes. More efficient than uint64 if values are often greater than 2^56. | uint64 | long | int/long | uint64 | ulong | integer/string | Bignum | -| sfixed32 | Always four bytes. | int32 | int | int | int32 | int | integer | Bignum or Fixnum (as required) | -| sfixed64 | Always eight bytes. | int64 | long | int/long | int64 | long | integer/string | Bignum | -| bool | | bool | boolean | boolean | bool | bool | boolean | TrueClass/FalseClass | -| string | A string must always contain UTF-8 encoded or 7-bit ASCII text. | string | String | str/unicode | string | string | string | String (UTF-8) | -| bytes | May contain any arbitrary sequence of bytes. | string | ByteString | str | []byte | ByteString | string | String (ASCII-8BIT) | - diff --git a/common/v1/gen/__init__.py b/common/v1/gen/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/common/v1/gen/cpp/uuid.grpc.pb.cc b/common/v1/gen/cpp/uuid.grpc.pb.cc deleted file mode 100644 index ea1af5a9..00000000 --- a/common/v1/gen/cpp/uuid.grpc.pb.cc +++ /dev/null @@ -1,29 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: uuid.proto - -#include "uuid.pb.h" -#include "uuid.grpc.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -namespace opi_api { -namespace common { -namespace v1 { - -} // namespace opi_api -} // namespace common -} // namespace v1 - diff --git a/common/v1/gen/cpp/uuid.grpc.pb.h b/common/v1/gen/cpp/uuid.grpc.pb.h deleted file mode 100644 index 62284af2..00000000 --- a/common/v1/gen/cpp/uuid.grpc.pb.h +++ /dev/null @@ -1,42 +0,0 @@ -// Generated by the gRPC C++ plugin. -// If you make any local change, they will be lost. -// source: uuid.proto -// Original file comments: -// SPDX-License-Identifier: Apache-2.0 -// Copyright (c) 2022 Dell Inc, or its subsidiaries. -// {C} Copyright 2022 Pensando Systems Inc. All rights reserved -// -#ifndef GRPC_uuid_2eproto__INCLUDED -#define GRPC_uuid_2eproto__INCLUDED - -#include "uuid.pb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace opi_api { -namespace common { -namespace v1 { - -} // namespace v1 -} // namespace common -} // namespace opi_api - - -#endif // GRPC_uuid_2eproto__INCLUDED diff --git a/common/v1/gen/cpp/uuid.pb.cc b/common/v1/gen/cpp/uuid.pb.cc deleted file mode 100644 index 6144b851..00000000 --- a/common/v1/gen/cpp/uuid.pb.cc +++ /dev/null @@ -1,303 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: uuid.proto - -#include "uuid.pb.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -// @@protoc_insertion_point(includes) -#include - -PROTOBUF_PRAGMA_INIT_SEG - -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = _pb::internal; - -namespace opi_api { -namespace common { -namespace v1 { -PROTOBUF_CONSTEXPR Uuid::Uuid( - ::_pbi::ConstantInitialized): _impl_{ - /*decltype(_impl_.value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} - , /*decltype(_impl_._cached_size_)*/{}} {} -struct UuidDefaultTypeInternal { - PROTOBUF_CONSTEXPR UuidDefaultTypeInternal() - : _instance(::_pbi::ConstantInitialized{}) {} - ~UuidDefaultTypeInternal() {} - union { - Uuid _instance; - }; -}; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UuidDefaultTypeInternal _Uuid_default_instance_; -} // namespace v1 -} // namespace common -} // namespace opi_api -static ::_pb::Metadata file_level_metadata_uuid_2eproto[1]; -static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_uuid_2eproto = nullptr; -static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_uuid_2eproto = nullptr; - -const uint32_t TableStruct_uuid_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::opi_api::common::v1::Uuid, _internal_metadata_), - ~0u, // no _extensions_ - ~0u, // no _oneof_case_ - ~0u, // no _weak_field_map_ - ~0u, // no _inlined_string_donated_ - PROTOBUF_FIELD_OFFSET(::opi_api::common::v1::Uuid, _impl_.value_), -}; -static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, -1, sizeof(::opi_api::common::v1::Uuid)}, -}; - -static const ::_pb::Message* const file_default_instances[] = { - &::opi_api::common::v1::_Uuid_default_instance_._instance, -}; - -const char descriptor_table_protodef_uuid_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = - "\n\nuuid.proto\022\021opi_api.common.v1\"\025\n\004Uuid\022" - "\r\n\005value\030\001 \001(\tBP\n\021opi_api.common.v1B\tUui" - "dProtoP\001Z.github.com/opiproject/opi-api/" - "common/v1/gen/gob\006proto3" - ; -static ::_pbi::once_flag descriptor_table_uuid_2eproto_once; -const ::_pbi::DescriptorTable descriptor_table_uuid_2eproto = { - false, false, 144, descriptor_table_protodef_uuid_2eproto, - "uuid.proto", - &descriptor_table_uuid_2eproto_once, nullptr, 0, 1, - schemas, file_default_instances, TableStruct_uuid_2eproto::offsets, - file_level_metadata_uuid_2eproto, file_level_enum_descriptors_uuid_2eproto, - file_level_service_descriptors_uuid_2eproto, -}; -PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_uuid_2eproto_getter() { - return &descriptor_table_uuid_2eproto; -} - -// Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_uuid_2eproto(&descriptor_table_uuid_2eproto); -namespace opi_api { -namespace common { -namespace v1 { - -// =================================================================== - -class Uuid::_Internal { - public: -}; - -Uuid::Uuid(::PROTOBUF_NAMESPACE_ID::Arena* arena, - bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { - SharedCtor(arena, is_message_owned); - // @@protoc_insertion_point(arena_constructor:opi_api.common.v1.Uuid) -} -Uuid::Uuid(const Uuid& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { - Uuid* const _this = this; (void)_this; - new (&_impl_) Impl_{ - decltype(_impl_.value_){} - , /*decltype(_impl_._cached_size_)*/{}}; - - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - _impl_.value_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.value_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_value().empty()) { - _this->_impl_.value_.Set(from._internal_value(), - _this->GetArenaForAllocation()); - } - // @@protoc_insertion_point(copy_constructor:opi_api.common.v1.Uuid) -} - -inline void Uuid::SharedCtor( - ::_pb::Arena* arena, bool is_message_owned) { - (void)arena; - (void)is_message_owned; - new (&_impl_) Impl_{ - decltype(_impl_.value_){} - , /*decltype(_impl_._cached_size_)*/{} - }; - _impl_.value_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.value_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING -} - -Uuid::~Uuid() { - // @@protoc_insertion_point(destructor:opi_api.common.v1.Uuid) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { - (void)arena; - return; - } - SharedDtor(); -} - -inline void Uuid::SharedDtor() { - GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - _impl_.value_.Destroy(); -} - -void Uuid::SetCachedSize(int size) const { - _impl_._cached_size_.Set(size); -} - -void Uuid::Clear() { -// @@protoc_insertion_point(message_clear_start:opi_api.common.v1.Uuid) - uint32_t cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - _impl_.value_.ClearToEmpty(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); -} - -const char* Uuid::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { -#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure - while (!ctx->Done(&ptr)) { - uint32_t tag; - ptr = ::_pbi::ReadTag(ptr, &tag); - switch (tag >> 3) { - // string value = 1; - case 1: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 10)) { - auto str = _internal_mutable_value(); - ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); - CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "opi_api.common.v1.Uuid.value")); - } else - goto handle_unusual; - continue; - default: - goto handle_unusual; - } // switch - handle_unusual: - if ((tag == 0) || ((tag & 7) == 4)) { - CHK_(ptr); - ctx->SetLastTag(tag); - goto message_done; - } - ptr = UnknownFieldParse( - tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), - ptr, ctx); - CHK_(ptr != nullptr); - } // while -message_done: - return ptr; -failure: - ptr = nullptr; - goto message_done; -#undef CHK_ -} - -uint8_t* Uuid::_InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { - // @@protoc_insertion_point(serialize_to_array_start:opi_api.common.v1.Uuid) - uint32_t cached_has_bits = 0; - (void) cached_has_bits; - - // string value = 1; - if (!this->_internal_value().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_value().data(), static_cast(this->_internal_value().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "opi_api.common.v1.Uuid.value"); - target = stream->WriteStringMaybeAliased( - 1, this->_internal_value(), target); - } - - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); - } - // @@protoc_insertion_point(serialize_to_array_end:opi_api.common.v1.Uuid) - return target; -} - -size_t Uuid::ByteSizeLong() const { -// @@protoc_insertion_point(message_byte_size_start:opi_api.common.v1.Uuid) - size_t total_size = 0; - - uint32_t cached_has_bits = 0; - // Prevent compiler warnings about cached_has_bits being unused - (void) cached_has_bits; - - // string value = 1; - if (!this->_internal_value().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_value()); - } - - return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); -} - -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Uuid::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, - Uuid::MergeImpl -}; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Uuid::GetClassData() const { return &_class_data_; } - - -void Uuid::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { - auto* const _this = static_cast(&to_msg); - auto& from = static_cast(from_msg); - // @@protoc_insertion_point(class_specific_merge_from_start:opi_api.common.v1.Uuid) - GOOGLE_DCHECK_NE(&from, _this); - uint32_t cached_has_bits = 0; - (void) cached_has_bits; - - if (!from._internal_value().empty()) { - _this->_internal_set_value(from._internal_value()); - } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); -} - -void Uuid::CopyFrom(const Uuid& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:opi_api.common.v1.Uuid) - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool Uuid::IsInitialized() const { - return true; -} - -void Uuid::InternalSwap(Uuid* other) { - using std::swap; - auto* lhs_arena = GetArenaForAllocation(); - auto* rhs_arena = other->GetArenaForAllocation(); - _internal_metadata_.InternalSwap(&other->_internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &_impl_.value_, lhs_arena, - &other->_impl_.value_, rhs_arena - ); -} - -::PROTOBUF_NAMESPACE_ID::Metadata Uuid::GetMetadata() const { - return ::_pbi::AssignDescriptors( - &descriptor_table_uuid_2eproto_getter, &descriptor_table_uuid_2eproto_once, - file_level_metadata_uuid_2eproto[0]); -} - -// @@protoc_insertion_point(namespace_scope) -} // namespace v1 -} // namespace common -} // namespace opi_api -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::opi_api::common::v1::Uuid* -Arena::CreateMaybeMessage< ::opi_api::common::v1::Uuid >(Arena* arena) { - return Arena::CreateMessageInternal< ::opi_api::common::v1::Uuid >(arena); -} -PROTOBUF_NAMESPACE_CLOSE - -// @@protoc_insertion_point(global_scope) -#include diff --git a/common/v1/gen/cpp/uuid.pb.h b/common/v1/gen/cpp/uuid.pb.h deleted file mode 100644 index 8e88dd3e..00000000 --- a/common/v1/gen/cpp/uuid.pb.h +++ /dev/null @@ -1,290 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: uuid.proto - -#ifndef GOOGLE_PROTOBUF_INCLUDED_uuid_2eproto -#define GOOGLE_PROTOBUF_INCLUDED_uuid_2eproto - -#include -#include - -#include -#if PROTOBUF_VERSION < 3021000 -#error This file was generated by a newer version of protoc which is -#error incompatible with your Protocol Buffer headers. Please update -#error your headers. -#endif -#if 3021006 < PROTOBUF_MIN_PROTOC_VERSION -#error This file was generated by an older version of protoc which is -#error incompatible with your Protocol Buffer headers. Please -#error regenerate this file with a newer version of protoc. -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include // IWYU pragma: export -#include // IWYU pragma: export -#include -// @@protoc_insertion_point(includes) -#include -#define PROTOBUF_INTERNAL_EXPORT_uuid_2eproto -PROTOBUF_NAMESPACE_OPEN -namespace internal { -class AnyMetadata; -} // namespace internal -PROTOBUF_NAMESPACE_CLOSE - -// Internal implementation detail -- do not use these members. -struct TableStruct_uuid_2eproto { - static const uint32_t offsets[]; -}; -extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_uuid_2eproto; -namespace opi_api { -namespace common { -namespace v1 { -class Uuid; -struct UuidDefaultTypeInternal; -extern UuidDefaultTypeInternal _Uuid_default_instance_; -} // namespace v1 -} // namespace common -} // namespace opi_api -PROTOBUF_NAMESPACE_OPEN -template<> ::opi_api::common::v1::Uuid* Arena::CreateMaybeMessage<::opi_api::common::v1::Uuid>(Arena*); -PROTOBUF_NAMESPACE_CLOSE -namespace opi_api { -namespace common { -namespace v1 { - -// =================================================================== - -class Uuid final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opi_api.common.v1.Uuid) */ { - public: - inline Uuid() : Uuid(nullptr) {} - ~Uuid() override; - explicit PROTOBUF_CONSTEXPR Uuid(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); - - Uuid(const Uuid& from); - Uuid(Uuid&& from) noexcept - : Uuid() { - *this = ::std::move(from); - } - - inline Uuid& operator=(const Uuid& from) { - CopyFrom(from); - return *this; - } - inline Uuid& operator=(Uuid&& from) noexcept { - if (this == &from) return *this; - if (GetOwningArena() == from.GetOwningArena() - #ifdef PROTOBUF_FORCE_COPY_IN_MOVE - && GetOwningArena() != nullptr - #endif // !PROTOBUF_FORCE_COPY_IN_MOVE - ) { - InternalSwap(&from); - } else { - CopyFrom(from); - } - return *this; - } - - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { - return GetDescriptor(); - } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { - return default_instance().GetMetadata().descriptor; - } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { - return default_instance().GetMetadata().reflection; - } - static const Uuid& default_instance() { - return *internal_default_instance(); - } - static inline const Uuid* internal_default_instance() { - return reinterpret_cast( - &_Uuid_default_instance_); - } - static constexpr int kIndexInFileMessages = - 0; - - friend void swap(Uuid& a, Uuid& b) { - a.Swap(&b); - } - inline void Swap(Uuid* other) { - if (other == this) return; - #ifdef PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() != nullptr && - GetOwningArena() == other->GetOwningArena()) { - #else // PROTOBUF_FORCE_COPY_IN_SWAP - if (GetOwningArena() == other->GetOwningArena()) { - #endif // !PROTOBUF_FORCE_COPY_IN_SWAP - InternalSwap(other); - } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); - } - } - void UnsafeArenaSwap(Uuid* other) { - if (other == this) return; - GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena()); - InternalSwap(other); - } - - // implements Message ---------------------------------------------- - - Uuid* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { - return CreateMaybeMessage(arena); - } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; - void CopyFrom(const Uuid& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - void MergeFrom( const Uuid& from) { - Uuid::MergeImpl(*this, from); - } - private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); - public: - PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; - bool IsInitialized() const final; - - size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; - uint8_t* _InternalSerialize( - uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; - int GetCachedSize() const final { return _impl_._cached_size_.Get(); } - - private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); - void SharedDtor(); - void SetCachedSize(int size) const final; - void InternalSwap(Uuid* other); - - private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; - static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() { - return "opi_api.common.v1.Uuid"; - } - protected: - explicit Uuid(::PROTOBUF_NAMESPACE_ID::Arena* arena, - bool is_message_owned = false); - public: - - static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; - - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - enum : int { - kValueFieldNumber = 1, - }; - // string value = 1; - void clear_value(); - const std::string& value() const; - template - void set_value(ArgT0&& arg0, ArgT... args); - std::string* mutable_value(); - PROTOBUF_NODISCARD std::string* release_value(); - void set_allocated_value(std::string* value); - private: - const std::string& _internal_value() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(const std::string& value); - std::string* _internal_mutable_value(); - public: - - // @@protoc_insertion_point(class_scope:opi_api.common.v1.Uuid) - private: - class _Internal; - - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; - struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr value_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - }; - union { Impl_ _impl_; }; - friend struct ::TableStruct_uuid_2eproto; -}; -// =================================================================== - - -// =================================================================== - -#ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wstrict-aliasing" -#endif // __GNUC__ -// Uuid - -// string value = 1; -inline void Uuid::clear_value() { - _impl_.value_.ClearToEmpty(); -} -inline const std::string& Uuid::value() const { - // @@protoc_insertion_point(field_get:opi_api.common.v1.Uuid.value) - return _internal_value(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void Uuid::set_value(ArgT0&& arg0, ArgT... args) { - - _impl_.value_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:opi_api.common.v1.Uuid.value) -} -inline std::string* Uuid::mutable_value() { - std::string* _s = _internal_mutable_value(); - // @@protoc_insertion_point(field_mutable:opi_api.common.v1.Uuid.value) - return _s; -} -inline const std::string& Uuid::_internal_value() const { - return _impl_.value_.Get(); -} -inline void Uuid::_internal_set_value(const std::string& value) { - - _impl_.value_.Set(value, GetArenaForAllocation()); -} -inline std::string* Uuid::_internal_mutable_value() { - - return _impl_.value_.Mutable(GetArenaForAllocation()); -} -inline std::string* Uuid::release_value() { - // @@protoc_insertion_point(field_release:opi_api.common.v1.Uuid.value) - return _impl_.value_.Release(); -} -inline void Uuid::set_allocated_value(std::string* value) { - if (value != nullptr) { - - } else { - - } - _impl_.value_.SetAllocated(value, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.value_.IsDefault()) { - _impl_.value_.Set("", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:opi_api.common.v1.Uuid.value) -} - -#ifdef __GNUC__ - #pragma GCC diagnostic pop -#endif // __GNUC__ - -// @@protoc_insertion_point(namespace_scope) - -} // namespace v1 -} // namespace common -} // namespace opi_api - -// @@protoc_insertion_point(global_scope) - -#include -#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_uuid_2eproto diff --git a/common/v1/gen/go/uuid.pb.go b/common/v1/gen/go/uuid.pb.go deleted file mode 100644 index 4c39148b..00000000 --- a/common/v1/gen/go/uuid.pb.go +++ /dev/null @@ -1,153 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright (c) 2022 Dell Inc, or its subsidiaries. -// {C} Copyright 2022 Pensando Systems Inc. All rights reserved - -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.28.1 -// protoc v3.21.6 -// source: uuid.proto - -package _go - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// A universally unique identifier (UUID) is a 128-bit label -// When generated according to the standard methods, UUIDs are, for practical purposes, unique. -type Uuid struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The value of the UUID - Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` -} - -func (x *Uuid) Reset() { - *x = Uuid{} - if protoimpl.UnsafeEnabled { - mi := &file_uuid_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Uuid) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Uuid) ProtoMessage() {} - -func (x *Uuid) ProtoReflect() protoreflect.Message { - mi := &file_uuid_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use Uuid.ProtoReflect.Descriptor instead. -func (*Uuid) Descriptor() ([]byte, []int) { - return file_uuid_proto_rawDescGZIP(), []int{0} -} - -func (x *Uuid) GetValue() string { - if x != nil { - return x.Value - } - return "" -} - -var File_uuid_proto protoreflect.FileDescriptor - -var file_uuid_proto_rawDesc = []byte{ - 0x0a, 0x0a, 0x75, 0x75, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x22, - 0x1c, 0x0a, 0x04, 0x55, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x50, 0x0a, - 0x11, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, - 0x76, 0x31, 0x42, 0x09, 0x55, 0x75, 0x69, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, - 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, 0x70, - 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_uuid_proto_rawDescOnce sync.Once - file_uuid_proto_rawDescData = file_uuid_proto_rawDesc -) - -func file_uuid_proto_rawDescGZIP() []byte { - file_uuid_proto_rawDescOnce.Do(func() { - file_uuid_proto_rawDescData = protoimpl.X.CompressGZIP(file_uuid_proto_rawDescData) - }) - return file_uuid_proto_rawDescData -} - -var file_uuid_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_uuid_proto_goTypes = []interface{}{ - (*Uuid)(nil), // 0: opi_api.common.v1.Uuid -} -var file_uuid_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { file_uuid_proto_init() } -func file_uuid_proto_init() { - if File_uuid_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_uuid_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Uuid); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_uuid_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_uuid_proto_goTypes, - DependencyIndexes: file_uuid_proto_depIdxs, - MessageInfos: file_uuid_proto_msgTypes, - }.Build() - File_uuid_proto = out.File - file_uuid_proto_rawDesc = nil - file_uuid_proto_goTypes = nil - file_uuid_proto_depIdxs = nil -} diff --git a/common/v1/gen/go/uuid.swagger.json b/common/v1/gen/go/uuid.swagger.json deleted file mode 100644 index 912411e5..00000000 --- a/common/v1/gen/go/uuid.swagger.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "uuid.proto", - "version": "version not set" - }, - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": {}, - "definitions": { - "protobufAny": { - "type": "object", - "properties": { - "type_url": { - "type": "string" - }, - "value": { - "type": "string", - "format": "byte" - } - } - }, - "rpcStatus": { - "type": "object", - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "details": { - "type": "array", - "items": { - "$ref": "#/definitions/protobufAny" - } - } - } - } - } -} diff --git a/common/v1/gen/java/opi_api/common/v1/Uuid.java b/common/v1/gen/java/opi_api/common/v1/Uuid.java deleted file mode 100644 index daab884b..00000000 --- a/common/v1/gen/java/opi_api/common/v1/Uuid.java +++ /dev/null @@ -1,597 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: uuid.proto - -package opi_api.common.v1; - -/** - * 
- * A universally unique identifier (UUID) is a 128-bit label
- * When generated according to the standard methods, UUIDs are, for practical purposes, unique.
- *
- * - * Protobuf type {@code opi_api.common.v1.Uuid} - */ -public final class Uuid extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:opi_api.common.v1.Uuid) - UuidOrBuilder { -private static final long serialVersionUID = 0L; - // Use Uuid.newBuilder() to construct. - private Uuid(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private Uuid() { - value_ = ""; - } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new Uuid(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Uuid( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - value_ = s; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return opi_api.common.v1.UuidProto.internal_static_opi_api_common_v1_Uuid_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return opi_api.common.v1.UuidProto.internal_static_opi_api_common_v1_Uuid_fieldAccessorTable - .ensureFieldAccessorsInitialized( - opi_api.common.v1.Uuid.class, opi_api.common.v1.Uuid.Builder.class); - } - - public static final int VALUE_FIELD_NUMBER = 1; - private volatile java.lang.Object value_; - /** - * 
-   * The value of the UUID
-   *
- * - * string value = 1; - * @return The value. - */ - @java.lang.Override - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - value_ = s; - return s; - } - } - /** - * 
-   * The value of the UUID
-   *
- * - * string value = 1; - * @return The bytes for value. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, value_); - } - unknownFields.writeTo(output); - } - - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(value_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, value_); - } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof opi_api.common.v1.Uuid)) { - return super.equals(obj); - } - opi_api.common.v1.Uuid other = (opi_api.common.v1.Uuid) obj; - - if (!getValue() - .equals(other.getValue())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + VALUE_FIELD_NUMBER; - hash = (53 * hash) + getValue().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static opi_api.common.v1.Uuid parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static opi_api.common.v1.Uuid parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static opi_api.common.v1.Uuid parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static opi_api.common.v1.Uuid parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static opi_api.common.v1.Uuid parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static opi_api.common.v1.Uuid parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static opi_api.common.v1.Uuid parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static opi_api.common.v1.Uuid parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static opi_api.common.v1.Uuid parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static opi_api.common.v1.Uuid parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static opi_api.common.v1.Uuid parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static opi_api.common.v1.Uuid parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(opi_api.common.v1.Uuid prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * 
-   * A universally unique identifier (UUID) is a 128-bit label
-   * When generated according to the standard methods, UUIDs are, for practical purposes, unique.
-   *
- * - * Protobuf type {@code opi_api.common.v1.Uuid} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:opi_api.common.v1.Uuid) - opi_api.common.v1.UuidOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return opi_api.common.v1.UuidProto.internal_static_opi_api_common_v1_Uuid_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return opi_api.common.v1.UuidProto.internal_static_opi_api_common_v1_Uuid_fieldAccessorTable - .ensureFieldAccessorsInitialized( - opi_api.common.v1.Uuid.class, opi_api.common.v1.Uuid.Builder.class); - } - - // Construct using opi_api.common.v1.Uuid.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - value_ = ""; - - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return opi_api.common.v1.UuidProto.internal_static_opi_api_common_v1_Uuid_descriptor; - } - - @java.lang.Override - public opi_api.common.v1.Uuid getDefaultInstanceForType() { - return opi_api.common.v1.Uuid.getDefaultInstance(); - } - - @java.lang.Override - public opi_api.common.v1.Uuid build() { - opi_api.common.v1.Uuid result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public opi_api.common.v1.Uuid buildPartial() { - opi_api.common.v1.Uuid result = new opi_api.common.v1.Uuid(this); - result.value_ = value_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof opi_api.common.v1.Uuid) { - return mergeFrom((opi_api.common.v1.Uuid)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(opi_api.common.v1.Uuid other) { - if (other == opi_api.common.v1.Uuid.getDefaultInstance()) return this; - if (!other.getValue().isEmpty()) { - value_ = other.value_; - onChanged(); - } - this.mergeUnknownFields(other.unknownFields); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - opi_api.common.v1.Uuid parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (opi_api.common.v1.Uuid) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private java.lang.Object value_ = ""; - /** - * 
-     * The value of the UUID
-     *
- * - * string value = 1; - * @return The value. - */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - value_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * 
-     * The value of the UUID
-     *
- * - * string value = 1; - * @return The bytes for value. - */ - public com.google.protobuf.ByteString - getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * 
-     * The value of the UUID
-     *
- * - * string value = 1; - * @param value The value to set. - * @return This builder for chaining. - */ - public Builder setValue( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - value_ = value; - onChanged(); - return this; - } - /** - * 
-     * The value of the UUID
-     *
- * - * string value = 1; - * @return This builder for chaining. - */ - public Builder clearValue() { - - value_ = getDefaultInstance().getValue(); - onChanged(); - return this; - } - /** - * 
-     * The value of the UUID
-     *
- * - * string value = 1; - * @param value The bytes for value to set. - * @return This builder for chaining. - */ - public Builder setValueBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - value_ = value; - onChanged(); - return this; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:opi_api.common.v1.Uuid) - } - - // @@protoc_insertion_point(class_scope:opi_api.common.v1.Uuid) - private static final opi_api.common.v1.Uuid DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new opi_api.common.v1.Uuid(); - } - - public static opi_api.common.v1.Uuid getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public Uuid parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Uuid(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public opi_api.common.v1.Uuid getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - -} - diff --git a/common/v1/gen/java/opi_api/common/v1/UuidOrBuilder.java b/common/v1/gen/java/opi_api/common/v1/UuidOrBuilder.java deleted file mode 100644 index 433c93d9..00000000 --- a/common/v1/gen/java/opi_api/common/v1/UuidOrBuilder.java +++ /dev/null @@ -1,29 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: uuid.proto - -package opi_api.common.v1; - -public interface UuidOrBuilder extends - // @@protoc_insertion_point(interface_extends:opi_api.common.v1.Uuid) - com.google.protobuf.MessageOrBuilder { - - /** - * 
-   * The value of the UUID
-   *
- * - * string value = 1; - * @return The value. - */ - java.lang.String getValue(); - /** - * 
-   * The value of the UUID
-   *
- * - * string value = 1; - * @return The bytes for value. - */ - com.google.protobuf.ByteString - getValueBytes(); -} diff --git a/common/v1/gen/java/opi_api/common/v1/UuidProto.java b/common/v1/gen/java/opi_api/common/v1/UuidProto.java deleted file mode 100644 index 09e61de1..00000000 --- a/common/v1/gen/java/opi_api/common/v1/UuidProto.java +++ /dev/null @@ -1,49 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: uuid.proto - -package opi_api.common.v1; - -public final class UuidProto { - private UuidProto() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { - } - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); - } - static final com.google.protobuf.Descriptors.Descriptor - internal_static_opi_api_common_v1_Uuid_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_opi_api_common_v1_Uuid_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; - static { - java.lang.String[] descriptorData = { - "\n\nuuid.proto\022\021opi_api.common.v1\"\025\n\004Uuid\022" + - "\r\n\005value\030\001 \001(\tBP\n\021opi_api.common.v1B\tUui" + - "dProtoP\001Z.github.com/opiproject/opi-api/" + - "common/v1/gen/gob\006proto3" - }; - descriptor = com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }); - internal_static_opi_api_common_v1_Uuid_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_opi_api_common_v1_Uuid_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_opi_api_common_v1_Uuid_descriptor, - new java.lang.String[] { "Value", }); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/common/v1/gen/python/__init__.py b/common/v1/gen/python/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/common/v1/gen/python/uuid_pb2.py b/common/v1/gen/python/uuid_pb2.py deleted file mode 100644 index 88f6ba8e..00000000 --- a/common/v1/gen/python/uuid_pb2.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: uuid.proto -"""Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder -from google.protobuf import descriptor as _descriptor -from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import symbol_database as _symbol_database -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nuuid.proto\x12\x11opi_api.common.v1\"\x15\n\x04Uuid\x12\r\n\x05value\x18\x01 \x01(\tBP\n\x11opi_api.common.v1B\tUuidProtoP\x01Z.github.com/opiproject/opi-api/common/v1/gen/gob\x06proto3') - -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'uuid_pb2', globals()) -if _descriptor._USE_C_DESCRIPTORS == False: - - DESCRIPTOR._options = None - DESCRIPTOR._serialized_options = b'\n\021opi_api.common.v1B\tUuidProtoP\001Z.github.com/opiproject/opi-api/common/v1/gen/go' - _UUID._serialized_start=33 - _UUID._serialized_end=54 -# @@protoc_insertion_point(module_scope) diff --git a/common/v1/gen/python/uuid_pb2_grpc.py b/common/v1/gen/python/uuid_pb2_grpc.py deleted file mode 100644 index 2daafffe..00000000 --- a/common/v1/gen/python/uuid_pb2_grpc.py +++ /dev/null @@ -1,4 +0,0 @@ -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -"""Client and server classes corresponding to protobuf-defined services.""" -import grpc - diff --git a/common/v1/uuid.proto b/common/v1/uuid.proto deleted file mode 100644 index 7ec5a5fd..00000000 --- a/common/v1/uuid.proto +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright (c) 2022 Dell Inc, or its subsidiaries. -// {C} Copyright 2022 Pensando Systems Inc. All rights reserved - -syntax = "proto3"; -package opi_api.common.v1; - -option java_package = "opi_api.common.v1"; -option java_multiple_files = true; -option java_outer_classname = "UuidProto"; - -option go_package = "github.com/opiproject/opi-api/common/v1/gen/go"; - -// A universally unique identifier (UUID) is a 128-bit label -// When generated according to the standard methods, UUIDs are, for practical purposes, unique. -message Uuid { - // The value of the UUID - string value = 1; -} diff --git a/inventory/README.md b/inventory/README.md index 7b4dc49e..d252314e 100644 --- a/inventory/README.md +++ b/inventory/README.md @@ -23,13 +23,13 @@ see Compile it as: ```bash -docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v "${PWD}/../common/v1":/common namely/protoc-all:1.51_2 -i /common --lint -d v1 -l go -o ./v1/gen/go/ --go-source-relative +docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs namely/protoc-all:1.51_2 -i /common --lint -d v1 -l go -o ./v1/gen/go/ --go-source-relative ``` Linter it as: ```bash -docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.57.0 -c "api-linter -I /common /out/*.proto --output-format github --set-exit-status" +docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.57.0 -c "api-linter -I /common /out/*.proto --output-format github --set-exit-status" ``` Additional linter: @@ -41,7 +41,7 @@ docker run --rm -it -v /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem:/etc/ss Generate [docs](v1/autogen.md) as: ```bash -docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1:/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" +docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1:/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" ``` Test your APIs even if unmerged using your private fork like this: diff --git a/network/cloud/Makefile b/network/cloud/Makefile index 3f7b4a69..a71e650e 100644 --- a/network/cloud/Makefile +++ b/network/cloud/Makefile @@ -12,13 +12,13 @@ doc: # protoc doesn't include annotation and http googleapis, so we have to get them here curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../../common/v1":/common -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" rm -rf "${PWD}"/google buflint: - docker run --rm -v "${PWD}/../../common/v1":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint bufgen: - docker run --rm -v "${PWD}/../../common/v1":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 diff --git a/network/evpn-gw/Makefile b/network/evpn-gw/Makefile index a8e1ac7f..77e20dd6 100644 --- a/network/evpn-gw/Makefile +++ b/network/evpn-gw/Makefile @@ -13,12 +13,12 @@ doc: # protoc doesn't include annotation and http googleapis, so we have to get them here curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../../common/v1":/common -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" rm -rf "${PWD}"/google buflint: - docker run --rm -v "${PWD}/../../common/v1":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint bufgen: - docker run --rm -v "${PWD}/../../common/v1":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 diff --git a/network/opinetcommon/Makefile b/network/opinetcommon/Makefile index 18f96bde..fb95efc3 100644 --- a/network/opinetcommon/Makefile +++ b/network/opinetcommon/Makefile @@ -5,10 +5,10 @@ all: buflint bufgen doc buflint: - docker run --rm -v "${PWD}/../../common/v1":/common -v "${PWD}":/out -w /out bufbuild/buf lint + docker run --rm -v "${PWD}":/out -w /out bufbuild/buf lint bufgen: - docker run --rm -v "${PWD}/../../common/v1":/common -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 + docker run --rm -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 doc: rm -rf ./google @@ -18,6 +18,6 @@ doc: # protoc doesn't include annotation and http googleapis, so we have to get them here curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" rm -rf "${PWD}"/google diff --git a/security/Makefile b/security/Makefile index fcff1b18..a76f01cf 100644 --- a/security/Makefile +++ b/security/Makefile @@ -18,7 +18,7 @@ all: mv google "${PWD}"/v1/ docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1/:/out -v "${PWD}"/v1:/protos pseudomuto/protoc-gen-doc:1.5.1 --doc_opt=markdown,autogen.md - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1/:/out -w /out -v "${PWD}"/v1:/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.63.1 -c "api-linter -I /common /out/*.proto --output-format summary" - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.63.1 -c "api-linter -I /common /out/*.proto --output-format github --disable-rule=core::0192 --disable-rule=core::0191 --disable-rule=core::0140 --disable-rule=core::0123 --disable-rule=core::0142 --disable-rule=core::0126 --disable-rule=core::0127 --disable-rule=core::0141 --disable-rule=core::0203 --disable-rule=core::0216 --set-exit-status" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1/:/out -w /out -v "${PWD}"/v1:/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.63.1 -c "api-linter -I /common /out/*.proto --output-format summary" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.63.1 -c "api-linter -I /common /out/*.proto --output-format github --disable-rule=core::0192 --disable-rule=core::0191 --disable-rule=core::0140 --disable-rule=core::0123 --disable-rule=core::0142 --disable-rule=core::0126 --disable-rule=core::0127 --disable-rule=core::0141 --disable-rule=core::0203 --disable-rule=core::0216 --set-exit-status" rm -rf "${PWD}"/v1/google diff --git a/storage/README.md b/storage/README.md index 7ae24c91..c931122f 100644 --- a/storage/README.md +++ b/storage/README.md @@ -50,13 +50,13 @@ _All implementations above are reference only and __not__ meant to be used as-is Compile it as: ```bash -docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v "${PWD}/../common/v1":/common namely/protoc-all:1.51_2 -i /common --lint -d v1alpha1 -l go -o ./v1alpha1/gen/go/ --go-source-relative +docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs namely/protoc-all:1.51_2 -i /common --lint -d v1alpha1 -l go -o ./v1alpha1/gen/go/ --go-source-relative ``` Linter it as: ```bash -docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.57.0 -c "api-linter -I /common /out/*.proto --output-format github --set-exit-status" +docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.57.0 -c "api-linter -I /common /out/*.proto --output-format github --set-exit-status" ``` Additional linter: @@ -68,7 +68,7 @@ docker run --rm -it -v /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem:/etc/ss Generate [docs](v1alpha1/autogen.md) as: ```bash -docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1alpha1:/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" +docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1alpha1:/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" ``` Test your APIs even if unmerged using your private fork like this: