feat: awakari.app instance

awakari · Jun 17, 2024 · 9d05626 · 9d05626
1 parent 2704e6a
commit 9d05626
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/config/config.go b/config/config.go
@@ -11,8 +11,9 @@ type Config struct {
 			Host string `envconfig:"API_HTTP_HOST" required:"true"`
 			Port uint16 `envconfig:"API_HTTP_PORT" default:"8080" required:"true"`
 		}
-		Port   uint16 `envconfig:"API_PORT" default:"50051" required:"true"`
-		Writer struct {
+		Port      uint16 `envconfig:"API_PORT" default:"50051" required:"true"`
+		EventType string `envconfig:"API_EVENT_TYPE" required:"true" default:"com.awakari.activitypub.v1"`
+		Writer    struct {
 			Backoff   time.Duration `envconfig:"API_WRITER_BACKOFF" default:"10s" required:"true"`
 			BatchSize uint32        `envconfig:"API_WRITER_BATCH_SIZE" default:"16" required:"true"`
 			Uri       string        `envconfig:"API_WRITER_URI" default:"resolver:50051" required:"true"`

diff --git a/helm/int-activitypub/templates/deployment.yaml b/helm/int-activitypub/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
             - name: API_HTTP_HOST
               value: "{{ .host }}"
             {{- end }}
+            - name: API_EVENT_TYPE
+              value: "{{ .Values.api.event.type }}"
             - name: API_WRITER_BACKOFF
               value: "{{ .Values.api.writer.backoff }}"
             - name: API_WRITER_BATCH_SIZE

diff --git a/helm/int-activitypub/values-awakari-app.yaml b/helm/int-activitypub/values-awakari-app.yaml
@@ -1,4 +1,6 @@
 api:
+  event:
+    type: "app.awakari.activitypub.v1"
   writer:
     uri: "api:50051"
 
@@ -7,7 +9,7 @@ cert:
   acme:
     server: "https://acme-v02.api.letsencrypt.org/directory"
   issuer:
-    name: letsencrypt
+    name: letsencrypt-awakari-app
 
 ingressHttpV1:
   hosts:

diff --git a/service/converter/service.go b/service/converter/service.go
@@ -18,9 +18,9 @@ type Service interface {
 }
 
 type service struct {
+	ceType string
 }
 
-const CeType = "com.awakari.activitypub.v1"
 const CeSpecVersion = "1.0"
 const CeKeyAction = "action"
 const CeKeyAttachmentUrl = "attachmenturl"
@@ -49,8 +49,10 @@ const asPublic = "https://www.w3.org/ns/activitystreams#Public"
 
 var ErrFail = errors.New("failed to convert")
 
-func NewService() Service {
-	return service{}
+func NewService(ceType string) Service {
+	return service{
+		ceType: ceType,
+	}
 }
 
 func (svc service) Convert(ctx context.Context, actor vocab.Actor, activity vocab.Activity, tags util.ActivityTags) (evt *pb.CloudEvent, err error) {
@@ -59,7 +61,7 @@ func (svc service) Convert(ctx context.Context, actor vocab.Actor, activity voca
 		Id:          uuid.NewString(),
 		Source:      actor.ID.String(),
 		SpecVersion: CeSpecVersion,
-		Type:        CeType,
+		Type:        svc.ceType,
 		Attributes: map[string]*pb.CloudEventAttributeValue{
 			CeKeyTime: {
 				Attr: &pb.CloudEventAttributeValue_CeTimestamp{