Skip to content
Snippets Groups Projects
Commit ba3667bf authored by Yordan Kinkov's avatar Yordan Kinkov
Browse files

Merge branch 'migrate-vereign-to-gaiax-gitlab' into 'main'

Migrate vereign to gaiax gitlab

See merge request gaiax/tsa-migrate/infohub!1
parents 5303c88e 2fea409f
No related branches found
No related tags found
No related merge requests found
Pipeline #55992 passed
Showing
with 85 additions and 75 deletions
......@@ -24,8 +24,8 @@ lint:
- golangci-lint --version
- golangci-lint run
before_script:
- ln -s /builds /go/src/code.vereign.com
- cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
- ln -s /builds /go/src/gitlab.com
- cd /go/src/gitlab.com/${CI_PROJECT_PATH}
unit tests:
image: golang:1.17.7
......
......@@ -2,8 +2,8 @@ stages:
- test
before_script:
- ln -s /builds /go/src/code.vereign.com
- cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
- ln -s /builds /go/src/gitlab.com
- cd /go/src/gitlab.com/${CI_PROJECT_PATH}
lint:
image: golangci/golangci-lint:v1.46.2
......
[![pipeline status](https://code.vereign.com/gaiax/tsa/infohub/badges/main/pipeline.svg)](https://code.vereign.com/gaiax/tsa/infohub/-/commits/main)
[![coverage report](https://code.vereign.com/gaiax/tsa/infohub/badges/main/coverage.svg)](https://code.vereign.com/gaiax/tsa/infohub/-/commits/main)
[![pipeline status](https://gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/badges/main/pipeline.svg)](https://gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/-/commits/main)
[![coverage report](https://gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/badges/main/coverage.svg)](https://gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/-/commits/main)
# Information Hub
......
......@@ -19,23 +19,23 @@ import (
goa "goa.design/goa/v3/pkg"
"golang.org/x/sync/errgroup"
"code.vereign.com/gaiax/tsa/golib/cache"
"code.vereign.com/gaiax/tsa/golib/goadec"
"code.vereign.com/gaiax/tsa/golib/graceful"
goahealth "code.vereign.com/gaiax/tsa/infohub/gen/health"
goahealthsrv "code.vereign.com/gaiax/tsa/infohub/gen/http/health/server"
goainfohubsrv "code.vereign.com/gaiax/tsa/infohub/gen/http/infohub/server"
goaopenapisrv "code.vereign.com/gaiax/tsa/infohub/gen/http/openapi/server"
goainfohub "code.vereign.com/gaiax/tsa/infohub/gen/infohub"
"code.vereign.com/gaiax/tsa/infohub/gen/openapi"
"code.vereign.com/gaiax/tsa/infohub/internal/clients/policy"
"code.vereign.com/gaiax/tsa/infohub/internal/clients/signer"
"code.vereign.com/gaiax/tsa/infohub/internal/config"
"code.vereign.com/gaiax/tsa/infohub/internal/credential"
"code.vereign.com/gaiax/tsa/infohub/internal/service"
"code.vereign.com/gaiax/tsa/infohub/internal/service/health"
"code.vereign.com/gaiax/tsa/infohub/internal/service/infohub"
"code.vereign.com/gaiax/tsa/infohub/internal/storage"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/cache"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/goadec"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/graceful"
goahealth "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/health"
goahealthsrv "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/http/health/server"
goainfohubsrv "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/http/infohub/server"
goaopenapisrv "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/http/openapi/server"
goainfohub "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/infohub"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/openapi"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/clients/policy"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/clients/signer"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/config"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/credential"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/health"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/infohub"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/storage"
)
var Version = "0.0.0+development"
......
FROM golang:1.17.10-alpine3.15 as builder
ENV GOPRIVATE=code.vereign.com
FROM golang:1.19-alpine3.15 as builder
RUN apk add git
WORKDIR /go/src/code.vereign.com/gaiax/tsa/infohub
WORKDIR /go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub
ADD . .
......
FROM golang:1.17.10
FROM golang:1.19
ENV GO111MODULE=on
ENV GOPRIVATE=code.vereign.com
RUN go install github.com/canthefason/go-watcher/cmd/watcher@v0.2.4
ADD . /go/src/code.vereign.com/gaiax/tsa/infohub
ADD . /go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub
WORKDIR /go/src/code.vereign.com/gaiax/tsa/infohub
WORKDIR /go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub
RUN go install -mod=vendor ./cmd/infohub/...
EXPOSE 8080
ENTRYPOINT ["sh", "-c", "/go/bin/watcher -run code.vereign.com/gaiax/tsa/infohub/cmd/infohub -watch code.vereign.com/gaiax/tsa/infohub"]
ENTRYPOINT ["sh", "-c", "/go/bin/watcher -run gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/cmd/infohub -watch gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub"]
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health client
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package health
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health endpoints
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package health
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health service
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package health
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// infohub HTTP client CLI support package
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package cli
......@@ -13,16 +14,15 @@ import (
"net/http"
"os"
healthc "code.vereign.com/gaiax/tsa/infohub/gen/http/health/client"
infohubc "code.vereign.com/gaiax/tsa/infohub/gen/http/infohub/client"
healthc "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/http/health/client"
infohubc "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/http/infohub/client"
goahttp "goa.design/goa/v3/http"
goa "goa.design/goa/v3/pkg"
)
// UsageCommands returns the set of commands and sub-commands using the format
//
// command (subcommand1|subcommand2|...)
//
// command (subcommand1|subcommand2|...)
func UsageCommands() string {
return `health (liveness|readiness)
infohub (export|import)
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health HTTP client CLI support package
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package client
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health client HTTP transport
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package client
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health HTTP client encoders and decoders
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package client
import (
"bytes"
"context"
"io/ioutil"
"io"
"net/http"
"net/url"
......@@ -38,13 +39,13 @@ func (c *Client) BuildLivenessRequest(ctx context.Context, v interface{}) (*http
func DecodeLivenessResponse(decoder func(*http.Response) goahttp.Decoder, restoreBody bool) func(*http.Response) (interface{}, error) {
return func(resp *http.Response) (interface{}, error) {
if restoreBody {
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
}
resp.Body = ioutil.NopCloser(bytes.NewBuffer(b))
resp.Body = io.NopCloser(bytes.NewBuffer(b))
defer func() {
resp.Body = ioutil.NopCloser(bytes.NewBuffer(b))
resp.Body = io.NopCloser(bytes.NewBuffer(b))
}()
} else {
defer resp.Body.Close()
......@@ -53,7 +54,7 @@ func DecodeLivenessResponse(decoder func(*http.Response) goahttp.Decoder, restor
case http.StatusOK:
return nil, nil
default:
body, _ := ioutil.ReadAll(resp.Body)
body, _ := io.ReadAll(resp.Body)
return nil, goahttp.ErrInvalidResponse("health", "Liveness", resp.StatusCode, string(body))
}
}
......@@ -80,13 +81,13 @@ func (c *Client) BuildReadinessRequest(ctx context.Context, v interface{}) (*htt
func DecodeReadinessResponse(decoder func(*http.Response) goahttp.Decoder, restoreBody bool) func(*http.Response) (interface{}, error) {
return func(resp *http.Response) (interface{}, error) {
if restoreBody {
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
}
resp.Body = ioutil.NopCloser(bytes.NewBuffer(b))
resp.Body = io.NopCloser(bytes.NewBuffer(b))
defer func() {
resp.Body = ioutil.NopCloser(bytes.NewBuffer(b))
resp.Body = io.NopCloser(bytes.NewBuffer(b))
}()
} else {
defer resp.Body.Close()
......@@ -95,7 +96,7 @@ func DecodeReadinessResponse(decoder func(*http.Response) goahttp.Decoder, resto
case http.StatusOK:
return nil, nil
default:
body, _ := ioutil.ReadAll(resp.Body)
body, _ := io.ReadAll(resp.Body)
return nil, goahttp.ErrInvalidResponse("health", "Readiness", resp.StatusCode, string(body))
}
}
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// HTTP request path constructors for the health service.
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package client
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health HTTP client types
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package client
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health HTTP server encoders and decoders
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package server
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// HTTP request path constructors for the health service.
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package server
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health HTTP server
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package server
......@@ -11,7 +12,7 @@ import (
"context"
"net/http"
health "code.vereign.com/gaiax/tsa/infohub/gen/health"
health "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/health"
goahttp "goa.design/goa/v3/http"
goa "goa.design/goa/v3/pkg"
)
......
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// health HTTP server types
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package server
// Code generated by goa v3.7.6, DO NOT EDIT.
// Code generated by goa v3.8.5, DO NOT EDIT.
//
// infohub HTTP client CLI support package
//
// Command:
// $ goa gen code.vereign.com/gaiax/tsa/infohub/design
// $ goa gen
// gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/design
package client
import (
infohub "code.vereign.com/gaiax/tsa/infohub/gen/infohub"
infohub "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/infohub"
)
// BuildExportPayload builds the payload for the infohub Export endpoint from
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment