Feat/sakura

.github/workflows/build.yml

@@ -7,8 +7,8 @@ jobs:
     name: Mod
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "./go.mod"
       - run: go mod download
@@ -20,8 +20,8 @@ jobs:
     env:
       CGO_ENABLED: "0"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "./go.mod"
       - run: go build

.github/workflows/release.yml

@@ -8,17 +8,22 @@ on:
       - '**'
 
 env:
-  IMAGE_NAME: dev-ops-bot
+  IMAGE_NAME: sakura-dev-ops-bot
+  REGISTRY: ghcr.io
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: "./go.mod"
 
@@ -34,37 +39,33 @@ jobs:
     name: Build Docker Image
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set IMAGE_TAG env
-        run: echo "IMAGE_TAG=$(echo ${GITHUB_REF:11})" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Extract version from tag
+        id: version
+        run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
+
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v3
-      - name: Show available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
 
-      - name: Get lowercased owner name
-        run: echo "REPO_OWNER=${GITHUB_REPOSITORY_OWNER@L}" >> $GITHUB_ENV
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ env.REPO_OWNER }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push
+      - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ env.IMAGE_TAG }}
+          build-args: VERSION=${{ steps.version.outputs.tag }}
           tags: |
-            ghcr.io/${{ env.REPO_OWNER }}/${{ env.IMAGE_NAME }}:latest
-            ghcr.io/${{ env.REPO_OWNER }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+            ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
+            ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.tag }}

.goreleaser.yml

@@ -1,16 +1,16 @@
 # .goreleaser.yml
-project_name: DevOpsBot
+project_name: sakura-DevOpsBot
 before:
   hooks:
     - go mod download
 builds:
-  - binary: devops-bot
+  - binary: sakura-devops-bot
     env:
       - CGO_ENABLED=0
     ldflags:
       - -s
       - -w
-      - -X github.com/traPtitech/DevOpsBot/pkg/utils.version={{.Version}}
+      - -X github.com/traPtitech/sakura-DevOpsBot/pkg/utils.version={{.Version}}
     goos:
       - darwin
       - linux

Dockerfile

@@ -1,6 +1,6 @@
 FROM --platform=$BUILDPLATFORM golang:1-alpine AS builder
 
-ENV CGO_ENABLED 0
+ENV CGO_ENABLED=0
 
 WORKDIR /work
 
@@ -16,7 +16,7 @@ ARG TARGETARCH
 ENV GOOS=$TARGETOS
 ENV GOARCH=$TARGETARCH
 RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
-    go build -o /dev-ops-bot -ldflags="-s -w -X github.com/traPtitech/DevOpsBot/pkg/utils.version=$VERSION" .
+    go build -o /dev-ops-bot -ldflags="-s -w -X github.com/traPtitech/sakura-DevOpsBot/pkg/utils.version=$VERSION" .
 
 FROM alpine:3
 

cmd/root.go

@@ -6,17 +6,17 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/traPtitech/DevOpsBot/pkg/bot"
-	"github.com/traPtitech/DevOpsBot/pkg/utils"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/bot"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/utils"
 )
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:          "DevOpsBot",
+	Use:          "sakura-DevOpsBot",
 	Short:        "A ChatOps bot for executing arbitrary shell commands.",
 	SilenceUsage: true,
 	PreRun: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("DevOpsBot v%s initializing\n", utils.Version())
+		fmt.Printf("sakura-DevOpsBot v%s initializing\n", utils.Version())
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return bot.Run(cmd.Context())

cmd/server.go

@@ -3,12 +3,12 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/traPtitech/DevOpsBot/pkg/server"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/server"
 )
 
 var serverCmd = &cobra.Command{
 	Use:          "server",
-	Short:        "ConoHa server manipulation",
+	Short:        "Sakura server manipulation",
 	SilenceUsage: true, // Do not display command usage when RunE returns error
 	RunE: func(cmd *cobra.Command, args []string) error {
 		s, err := server.Compile()

go.mod

@@ -1,4 +1,4 @@
-module github.com/traPtitech/DevOpsBot
+module github.com/traPtitech/sakura-DevOpsBot
 
 go 1.22
 
@@ -14,7 +14,6 @@ require (
 	github.com/traPtitech/go-traq v0.0.0-20240725071454-97c7b85dc879
 	github.com/traPtitech/traq-ws-bot v1.2.1
 	go.uber.org/zap v1.27.0
-	golang.org/x/sync v0.7.0
 )
 
 require (

go.sum

@@ -90,8 +90,6 @@ golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2
 golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
 golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/traPtitech/DevOpsBot/cmd"
+	"github.com/traPtitech/sakura-DevOpsBot/cmd"
 )
 
 func main() {

pkg/bot/bot.go

@@ -3,13 +3,14 @@ package bot
 import (
 	"context"
 	"fmt"
-	"github.com/traPtitech/DevOpsBot/pkg/bot/slack"
-	"github.com/traPtitech/DevOpsBot/pkg/config"
-	"github.com/traPtitech/DevOpsBot/pkg/domain"
+
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/bot/slack"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/config"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/domain"
 
 	"go.uber.org/zap"
 
-	"github.com/traPtitech/DevOpsBot/pkg/bot/traq"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/bot/traq"
 )
 
 func Run(ctx context.Context) error {

pkg/bot/command.go

@@ -11,9 +11,9 @@ import (
 
 	"github.com/samber/lo"
 
-	"github.com/traPtitech/DevOpsBot/pkg/config"
-	"github.com/traPtitech/DevOpsBot/pkg/domain"
-	"github.com/traPtitech/DevOpsBot/pkg/utils"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/config"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/domain"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/utils"
 )
 
 var (

pkg/bot/help.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/traPtitech/DevOpsBot/pkg/config"
-	"github.com/traPtitech/DevOpsBot/pkg/domain"
-	"github.com/traPtitech/DevOpsBot/pkg/utils"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/config"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/domain"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/utils"
 )
 
 var _ domain.Command = (*HelpCommand)(nil)
@@ -21,7 +21,7 @@ func (h *HelpCommand) Execute(ctx domain.Context) error {
 
 	// Root usage
 	if len(args) == 0 {
-		lines = append(lines, fmt.Sprintf("## DevOpsBot v%s", utils.Version()))
+		lines = append(lines, fmt.Sprintf("## sakura-DevOpsBot v%s", utils.Version()))
 		lines = append(lines, "")
 		lines = append(lines, h.root.HelpMessage(0, true)...)
 		lines = append(lines, "")

pkg/bot/slack/bot.go

@@ -3,17 +3,18 @@ package slack
 import (
 	"context"
 	"fmt"
+	"log/slog"
+	"regexp"
+	"strings"
+
 	"github.com/kballard/go-shellquote"
 	"github.com/samber/lo"
 	"github.com/slack-go/slack"
 	"github.com/slack-go/slack/slackevents"
 	"github.com/slack-go/slack/socketmode"
-	"github.com/traPtitech/DevOpsBot/pkg/config"
-	"github.com/traPtitech/DevOpsBot/pkg/domain"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/config"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/domain"
 	"go.uber.org/zap"
-	"log/slog"
-	"regexp"
-	"strings"
 )
 
 const slashPrefix = "/"

pkg/bot/slack/context.go

@@ -2,12 +2,13 @@ package slack
 
 import (
 	"context"
+	"strings"
+
 	"github.com/slack-go/slack"
-	"github.com/traPtitech/DevOpsBot/pkg/config"
-	"github.com/traPtitech/DevOpsBot/pkg/domain"
-	"github.com/traPtitech/DevOpsBot/pkg/utils"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/config"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/domain"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/utils"
 	"go.uber.org/zap"
-	"strings"
 )
 
 type slackContext struct {

pkg/bot/traq/bot.go

@@ -3,15 +3,16 @@ package traq
 import (
 	"context"
 	"fmt"
+	"strings"
+
 	"github.com/kballard/go-shellquote"
 	"github.com/samber/lo"
-	"github.com/traPtitech/DevOpsBot/pkg/config"
-	"github.com/traPtitech/DevOpsBot/pkg/domain"
 	"github.com/traPtitech/go-traq"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/config"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/domain"
 	traqwsbot "github.com/traPtitech/traq-ws-bot"
 	"github.com/traPtitech/traq-ws-bot/payload"
 	"go.uber.org/zap"
-	"strings"
 )
 
 type traqBot struct {

pkg/bot/traq/context.go

@@ -2,15 +2,16 @@ package traq
 
 import (
 	"context"
-	"github.com/traPtitech/DevOpsBot/pkg/config"
-	"github.com/traPtitech/DevOpsBot/pkg/domain"
+	"strings"
+
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/config"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/domain"
 	"github.com/traPtitech/traq-ws-bot/payload"
 	"go.uber.org/zap"
-	"strings"
 
 	"github.com/traPtitech/go-traq"
 
-	"github.com/traPtitech/DevOpsBot/pkg/utils"
+	"github.com/traPtitech/sakura-DevOpsBot/pkg/utils"
 )
 
 type traqContext struct {

pkg/config/config.go

@@ -102,15 +102,12 @@ type CommandConfig struct {
 }
 
 type ServersConfig struct {
-	Conoha struct {
-		Origin struct {
-			Identity string `mapstructure:"identity" yaml:"identity"`
-			Compute  string `mapstructure:"compute" yaml:"compute"`
-		} `mapstructure:"origin" yaml:"origin"`
-		Username string `mapstructure:"username" yaml:"username"`
-		Password string `mapstructure:"password" yaml:"password"`
-		TenantID string `mapstructure:"tenantID" yaml:"tenantID"`
-	} `mapstructure:"conoha" yaml:"conoha"`
+	Sakura struct {
+		Origin string `mapstructure:"origin" yaml:"origin"`
+		// ServersAPIURLPath must start with "/"
+		ServersAPIURLPath string `mapstructure:"serversAPIURLPath" yaml:"serversAPIURLPath"`
+		BearerToken       string `mapstructure:"bearerToken" yaml:"bearerToken"`
+	} `mapstructure:"sakura" yaml:"sakura"`
 }
 
 func init() {
@@ -143,11 +140,9 @@ func init() {
 	viper.SetDefault("templates", nil)
 	viper.SetDefault("commands", nil)
 
-	viper.SetDefault("servers.conoha.origin.identity", "https://identity.tyo1.conoha.io/")
-	viper.SetDefault("servers.conoha.origin.compute", "https://compute.tyo1.conoha.io/")
-	viper.SetDefault("servers.conoha.username", "")
-	viper.SetDefault("servers.conoha.password", "")
-	viper.SetDefault("servers.conoha.tenantID", "")
+	viper.SetDefault("servers.sakura.origin", "https://secure.sakura.ad.jp")
+	viper.SetDefault("servers.sakura.serversAPIURLPath", "/vps/api/v7/servers")
+	viper.SetDefault("servers.sakura.bearerToken", "")
 }
 
 func init() {