diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index db708c8..9d1626f 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -8,7 +8,7 @@ env: PACKAGE_NAME: go-server-with-otel BINARY_PATH: bin BINARY_NAME: go-server-with-otel - GO_MOD_PATH: gitea.libretechconsulting.com/rmcguire/go-server-with-otel + GO_MOD_PATH: gitea.libretechconsulting.com/rmcguire/class-server GO_GIT_HOST: gitea.libretechconsulting.com VER_PKG: gitea.libretechconsulting.com/rmcguire/go-app/pkg/config.Version VERSION: ${{ github.ref_name }} diff --git a/Makefile b/Makefile index 09c8874..1c9fa08 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ PROTO_DIRS := $(wildcard proto/demo/app/*) # TODO: Update path (probably not dem PLATFORMS := linux/amd64 linux/arm64 darwin/amd64 darwin/arm64 OUTPUT_DIR := bin VER_PKG := gitea.libretechconsulting.com/rmcguire/go-app/pkg/config.Version -GIT_REPO := gitea.libretechconsulting.com/rmcguire/go-server-with-otel +GIT_REPO := gitea.libretechconsulting.com/rmcguire/class-server all: proto test build docker diff --git a/api/demo/app/v1alpha1/app.pb.go b/api/demo/app/v1alpha1/app.pb.go index 7148251..a5f68ef 100644 --- a/api/demo/app/v1alpha1/app.pb.go +++ b/api/demo/app/v1alpha1/app.pb.go @@ -153,7 +153,7 @@ const file_demo_app_v1alpha1_app_proto_rawDesc = "" + "\x06source\x18\x03 \x01(\tR\x06source\x12\x1a\n" + "\blanguage\x18\x04 \x01(\tR\blanguage2z\n" + "\x0eDemoAppService\x12h\n" + - "\aGetDemo\x12!.demo.app.v1alpha1.GetDemoRequest\x1a\".demo.app.v1alpha1.GetDemoResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1alpha1/demoBNZLgitea.libretechconsulting.com/rmcguire/go-server-with-otel/api/v1alpha1/demob\x06proto3" + "\aGetDemo\x12!.demo.app.v1alpha1.GetDemoRequest\x1a\".demo.app.v1alpha1.GetDemoResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1alpha1/demoBNZLgitea.libretechconsulting.com/rmcguire/class-server/api/v1alpha1/demob\x06proto3" var ( file_demo_app_v1alpha1_app_proto_rawDescOnce sync.Once diff --git a/go.mod b/go.mod index 19cecc4..5ccb58a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitea.libretechconsulting.com/rmcguire/go-server-with-otel +module gitea.libretechconsulting.com/rmcguire/class-server go 1.24.1 diff --git a/helm/values.yaml b/helm/values.yaml index 07e988c..f25c1b3 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -32,7 +32,7 @@ hull: ## Chart settings settings: resources: {} # Applies to the app container - repo: gitea.libretechconsulting.com/rmcguire/go-server-with-otel + repo: gitea.libretechconsulting.com/rmcguire/class-server tag: _HT**Chart.AppVersion httpPort: 8080 # Should match appConfig http.listen diff --git a/main.go b/main.go index 45db6ef..d872302 100644 --- a/main.go +++ b/main.go @@ -23,9 +23,9 @@ import ( optsgrpc "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/grpc/opts" optshttp "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts" - "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/pkg/config" - "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/pkg/demogrpc" - "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/pkg/demohttp" + "gitea.libretechconsulting.com/rmcguire/class-server/pkg/config" + "gitea.libretechconsulting.com/rmcguire/class-server/pkg/demogrpc" + "gitea.libretechconsulting.com/rmcguire/class-server/pkg/demohttp" ) var flagSchema bool diff --git a/pkg/demogrpc/demo.go b/pkg/demogrpc/demo.go index ddc628b..5f54376 100644 --- a/pkg/demogrpc/demo.go +++ b/pkg/demogrpc/demo.go @@ -15,8 +15,8 @@ import ( "gitea.libretechconsulting.com/rmcguire/go-app/pkg/otel" - pb "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/api/demo/app/v1alpha1" - "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/pkg/config" + pb "gitea.libretechconsulting.com/rmcguire/class-server/api/demo/app/v1alpha1" + "gitea.libretechconsulting.com/rmcguire/class-server/pkg/config" ) const ( diff --git a/pkg/demogrpc/fact.go b/pkg/demogrpc/fact.go index 8a1603b..1cf7d79 100644 --- a/pkg/demogrpc/fact.go +++ b/pkg/demogrpc/fact.go @@ -3,7 +3,7 @@ package demogrpc import ( "google.golang.org/protobuf/types/known/timestamppb" - pb "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/api/demo/app/v1alpha1" + pb "gitea.libretechconsulting.com/rmcguire/class-server/api/demo/app/v1alpha1" ) type RandomFact struct { diff --git a/pkg/demogrpc/server.go b/pkg/demogrpc/server.go index c8f6bac..3681148 100644 --- a/pkg/demogrpc/server.go +++ b/pkg/demogrpc/server.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - demoAppPb "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/api/demo/app/v1alpha1" + demoAppPb "gitea.libretechconsulting.com/rmcguire/class-server/api/demo/app/v1alpha1" ) func (ds *DemoGRPCServer) GetDialOpts() []grpc.DialOption { diff --git a/pkg/demohttp/server.go b/pkg/demohttp/server.go index c0f6dd2..2f5435e 100644 --- a/pkg/demohttp/server.go +++ b/pkg/demohttp/server.go @@ -6,7 +6,7 @@ import ( "gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts" - "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/pkg/config" + "gitea.libretechconsulting.com/rmcguire/class-server/pkg/config" ) type DemoHTTPServer struct { diff --git a/proto/class/v1alpha1/class.proto b/proto/class/v1alpha1/class.proto new file mode 100644 index 0000000..7dc333e --- /dev/null +++ b/proto/class/v1alpha1/class.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; +package class.v1alpha1; + +import "google/api/annotations.proto"; +import "google/protobuf/timestamp.proto"; + +option go_package = "gitea.libretechconsulting.com/rmcguire/class-server/api/v1alpha1/class"; + +enum LogoType { + LOGO_TYPE_UNSPECIFIED = 0; + LOGO_TYPE_RANDOM = 1; + LOGO_TYPE_TECH = 2; +} + +message GetClassLogoRequest { + LogoType logo_type = 1; + // Default is no padding + optional uint32 logo_padding = 2; + optional bool include_string = 3; +} + +message GetClassLogoResponse { + bytes logo_bytes = 1; + string logo_string = 2; +} + +service ClassService { + rpc GetClassLogo(GetClassLogoRequest) returns (GetClassLogoResponse) { + option (google.api.http) = {get: "/v1alpha1/class/logo"}; // grpc-gateway endpoint + } +} diff --git a/proto/demo/app/v1alpha1/app.proto b/proto/demo/app/v1alpha1/app.proto index 2301aa3..d183e54 100644 --- a/proto/demo/app/v1alpha1/app.proto +++ b/proto/demo/app/v1alpha1/app.proto @@ -4,7 +4,7 @@ package demo.app.v1alpha1; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "gitea.libretechconsulting.com/rmcguire/go-server-with-otel/api/v1alpha1/demo"; +option go_package = "gitea.libretechconsulting.com/rmcguire/class-server/api/v1alpha1/demo"; // Options for random fact, in this case // just a language