Merge pull request #14 from cloudnative-id/multiple-dispatcher

zufardhiyaulhaq · web-flow · commit 19e73178fc4d · 2020-11-01T02:11:15.000+07:00
refactor telegram &amp; twitter dispatcher to support multiple account/group
diff --git a/.env b/.env
@@ -0,0 +1,14 @@
+telegram:
+  enabled: true
+  group:
+  - chatId: "group_one_chatid"
+    token: "bot_token"
+  - chatId: "group_two_chatid"
+    token: "bot_token"
+twitter:
+  enabled: false
+  account:
+  - apiKey: "account_api_key"
+    apiSecretKey: "account_api_secret_key"
+    accessToken: "account_access_token"
+    accessTokenSecret: "account_access_token_secret"
diff --git a/.env-example b/.env-example
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -14,8 +14,8 @@ Fork and clone **[community-operator](https://github.com/cloudnative-id/communit
 
 - Setup your environment
 ```
-cp .env-example .env
-set -o allexport; source .env; set +o allexport
+sudo mkdir /etc/community-operator/
+sudo cp .env /etc/community-operator/community-operator-config.yaml
 ```
 
 - deploy CRDs
@@ -37,6 +37,10 @@ kubectl apply -f examples/meetup/example.yaml
 kubectl apply -f examples/announcement/example.yaml
 ```
 
+- Build community-operator image
+```
+operator-sdk build account/repository:tag
+```
 
 ### Submit a pull request
 As you are ready with your code contribution, push your branch to your `community-operator` fork and open a pull request against the **master** branch.
diff --git a/.gitignore b/.gitignore
@@ -75,4 +75,3 @@ tags
 .vscode/*
 .history
 # End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
-.env
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project should be documented in this file.
 
+### v0.0.5
+- support for multiple telegram group
+- support for multiple twitter account
+- refactor configuration to file based configuration
+
 ### v0.0.4
 - Telegram dispatcher supported
 - Twitter dispatcher supported
diff --git a/FEATURE.md b/FEATURE.md
@@ -6,9 +6,9 @@
 
 #### Dispatcher
 - [x] telegram dispatcher
-- [ ] support for multiple telegram dispatcher
+- [x] support for multiple telegram dispatcher
 - [x] twitter dispatcher
-- [ ] support for multiple twitter dispatcher
+- [x] support for multiple twitter dispatcher
 - [ ] facebook dispatcher
 - [ ] support for multiple facebook dispatcher
 
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # community-operator
 
+![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.5](https://img.shields.io/badge/AppVersion-0.0.5-informational?style=flat-square)
+
 The Community Operator provides Kubernetes native deployment and management of your community. The purpose of this project is to simplify and automate community management in top of Kubernetes clusters.
 
 Community-operator currently watch CRDs on the same namespace as the community-operator deployed.
diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 name: community-operator
 type: application
-version: 0.0.4
-appVersion: 0.0.4
+version: 0.0.5
+appVersion: 0.0.5
 description: community-operator for managing community lifecycle
 home: https://github.com/cloudnative-id/community-operator
 keywords:
diff --git a/charts/README.md b/charts/README.md
@@ -9,20 +9,26 @@ helm install ./charts --name community-operator
 
 ### Configuration
 
-| Parameter | Description | Default |
-|-|-| -|
-| operator.image | Image for community-operator | cloudnativeid/community-operator |
-| operator.tag | Tag for image community-operator | 0.0.4 |
-| operator.pullPolicy | pullPolicy | Always |
-| operator.replica | number of replica | 3 |
-| telegram.enabled | Telegram enabled | "true" |
-| telegram.chatid | Telegram chatid | |
-| telegram.token | Telegram bot token | |
-| twitter.enabled | Telegram enabled | "true" |
-| twitter.api_key | Twitter API key | |
-| twitter.api_secret_key | Twitter API secret key | |
-| twitter.access_token | Twitter access token | |
-| twitter.access_token_secret | TTwitter access token secrets | |
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| config.telegram.enabled | bool | `true` |  |
+| config.telegram.group[0].chatId | string | `"group_one_chatid"` |  |
+| config.telegram.group[0].token | string | `"bot_token"` |  |
+| config.telegram.group[1].chatId | string | `"group_two_chatid"` |  |
+| config.telegram.group[1].token | string | `"bot_token"` |  |
+| config.twitter.account[0].accessToken | string | `"account_0_access_token"` |  |
+| config.twitter.account[0].accessTokenSecret | string | `"account_0_access_token_secret"` |  |
+| config.twitter.account[0].apiKey | string | `"account_0_api_key"` |  |
+| config.twitter.account[0].apiSecretKey | string | `"account_0_api_secret_key"` |  |
+| config.twitter.account[1].accessToken | string | `"account_1_access_token"` |  |
+| config.twitter.account[1].accessTokenSecret | string | `"account_1_access_token_secret"` |  |
+| config.twitter.account[1].apiKey | string | `"account_1_api_key"` |  |
+| config.twitter.account[1].apiSecretKey | string | `"account_1_api_secret_key"` |  |
+| config.twitter.enabled | bool | `false` |  |
+| operator.image | string | `"cloudnativeid/community-operator"` |  |
+| operator.pullPolicy | string | `"Always"` |  |
+| operator.replica | int | `1` |  |
+| operator.tag | string | `"0.0.5"` |  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to helm install. For example:
 ```
diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
@@ -19,17 +19,13 @@ spec:
         image: {{ .Values.operator.image }}:{{ .Values.operator.tag }}
         imagePullPolicy: {{ .Values.operator.pullPolicy }}
         env:
-          - name: WATCH_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
           - name: OPERATOR_NAME
             value: {{ .Chart.Name }}
-        envFrom:
-        - secretRef:
-            name: {{ .Chart.Name }}-secret
-
+        volumeMounts:
+        - name: {{ .Chart.Name }}-secret
+          mountPath: "/etc/community-operator/"
+      volumes:
+      - name: {{ .Chart.Name }}-secret
+        secret:
+          secretName: {{ .Chart.Name }}-secret
+          defaultMode: 0400
diff --git a/charts/templates/secret.yaml b/charts/templates/secret.yaml
@@ -4,11 +4,5 @@ kind: Secret
 metadata:
   name: {{ .Chart.Name }}-secret
 data:
-  TELEGRAM_ENABLED: {{ .Values.telegram.enabled | b64enc }}
-  TELEGRAM_TOKEN: {{ .Values.telegram.token | b64enc }}
-  TELEGRAM_CHATID: {{ .Values.telegram.chatid | b64enc }}
-  TWITTER_ENABLED: {{ .Values.twitter.enabled | b64enc }}
-  TWITTER_API_KEY: {{ .Values.twitter.api_key | b64enc }}
-  TWITTER_API_SECRET_KEY: {{ .Values.twitter.api_secret_key | b64enc }}
-  TWITTER_ACCESS_TOKEN: {{ .Values.twitter.access_token | b64enc }}
-  TWITTER_ACCESS_TOKEN_SECRET: {{ .Values.twitter.access_token_secret | b64enc }}
+  community-operator-config.yaml: |
+{{ toYaml .Values.config | indent 4 }}
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -1,29 +1,25 @@
 operator:
-  # image of community-operator
   image: "cloudnativeid/community-operator"
-  # tag of communoty-operator image
-  tag: "0.0.4"
-  # pullPolicy for operator image
+  tag: "0.0.5"
   pullPolicy: "Always"
-  # number of replica for deployment
   replica: 1
 
-telegram:
-  # set telegram bot is enabled or not
-  enabled: "true"
-  # fill with your group chat_id
-  chatid: "asasasa"
-  # fill with your bot token
-  token: "asdasdasdas"
-
-twitter:
-  # set twitter bot is enabled or not
-  enabled: "false"
-  # fill with your API_KEY
-  api_key: "-0101234"
-  # fill with your API_SECRET_KEY
-  api_secret_key: "-0101234"
-  # fill with your ACCESS_TOKEN
-  access_token: "-0101234"
-  # fill with your ACCESS_TOKEN_SECRET
-  access_token_secret: "-0101234"
+config:
+  telegram:
+    enabled: true
+    group:
+    - chatId: "group_one_chatid"
+      token: "bot_token"
+    - chatId: "group_two_chatid"
+      token: "bot_token"
+  twitter:
+    enabled: false
+    account:
+    - apiKey: "account_0_api_key"
+      apiSecretKey: "account_0_api_secret_key"
+      accessToken: "account_0_access_token"
+      accessTokenSecret: "account_0_access_token_secret"
+    - apiKey: "account_1_api_key"
+      apiSecretKey: "account_1_api_secret_key"
+      accessToken: "account_1_access_token"
+      accessTokenSecret: "account_1_access_token_secret"
diff --git a/config/config.go b/config/config.go
@@ -0,0 +1,20 @@
+package config
+
+type Config struct {
+	Telegram struct {
+		Enabled bool `yaml:"enabled"`
+		Group   []struct {
+			ChatID string `yaml:"chatId"`
+			Token  string `yaml:"token"`
+		} `yaml:"group"`
+	} `yaml:"telegram"`
+	Twitter struct {
+		Enabled bool `yaml:"enabled"`
+		Account []struct {
+			APIKey            string `yaml:"apiKey"`
+			APISecretKey      string `yaml:"apiSecretKey"`
+			AccessToken       string `yaml:"accessToken"`
+			AccessTokenSecret string `yaml:"accessTokenSecret"`
+		} `yaml:"account"`
+	} `yaml:"twitter"`
+}
diff --git a/dispatcher/dispatcher.go b/dispatcher/dispatcher.go
@@ -3,47 +3,37 @@ package dispatcher
 import (
 	"bytes"
 	"fmt"
-	"os"
+	"io/ioutil"
 	"sort"
-	"strconv"
 	"strings"
 	"text/template"
 	"time"
 
+	"github.com/cloudnative-id/community-operator/config"
 	communityv1alpha1 "github.com/cloudnative-id/community-operator/pkg/apis/community/v1alpha1"
+	"sigs.k8s.io/yaml"
 )
 
 type Dispatcher struct {
-	telegramEnabled    bool
-	twitterEnabled     bool
+	config             config.Config
 	telegramDispatcher TelegramDispatcher
 	twitterDispacher   TwitterDispatcher
 }
 
-func (dp *Dispatcher) getCredential() {
-	var err error
-
-	dp.telegramEnabled, err = strconv.ParseBool(os.Getenv("TELEGRAM_ENABLED"))
+func (dp *Dispatcher) getConfig() {
+	configFile, err := ioutil.ReadFile("/etc/community-operator/community-operator-config.yaml")
 	if err != nil {
 		panic(err)
 	}
 
-	dp.twitterEnabled, err = strconv.ParseBool(os.Getenv("TWITTER_ENABLED"))
+	err = yaml.Unmarshal(configFile, &dp.config)
 	if err != nil {
 		panic(err)
 	}
 }
 
 func (dp *Dispatcher) Start() {
-	dp.getCredential()
-
-	if dp.telegramEnabled {
-		dp.telegramDispatcher.Start()
-	}
-
-	if dp.twitterEnabled {
-		dp.twitterDispacher.Start()
-	}
+	dp.getConfig()
 }
 
 func (dp *Dispatcher) sendTelegram(message bytes.Buffer, picture string) {
@@ -81,7 +71,7 @@ func (dp *Dispatcher) sendTwitter(message bytes.Buffer, picture string) {
 	}
 }
 
-func format(dispatcher string, data interface{}) bytes.Buffer {
+func populateTemplate(dispatcher string, data interface{}) bytes.Buffer {
 	var tmpl string
 	var output bytes.Buffer
 
@@ -108,45 +98,65 @@ func format(dispatcher string, data interface{}) bytes.Buffer {
 }
 
 func (dp *Dispatcher) SendWeekly(weeklyData communityv1alpha1.WeeklySpec) {
-
 	sort.Slice(weeklyData.Articles, func(i, j int) bool {
 		return weeklyData.Articles[i].Type < weeklyData.Articles[j].Type
 	})
 
-	telegramData := format("telegram", weeklyData)
-	twitterData := format("twitter", weeklyData)
+	if dp.config.Telegram.Enabled {
+		for _, config := range dp.config.Telegram.Group {
+			dp.telegramDispatcher.Start(config.Token, config.ChatID)
 
-	if dp.telegramEnabled {
-		dp.sendTelegram(telegramData, weeklyData.Image)
+			telegramData := populateTemplate("telegram", weeklyData)
+			dp.sendTelegram(telegramData, weeklyData.Image)
+		}
 	}
 
-	if dp.twitterEnabled {
-		dp.sendTwitter(twitterData, weeklyData.Image)
+	if dp.config.Twitter.Enabled {
+		for _, config := range dp.config.Twitter.Account {
+			dp.twitterDispacher.Start(config.APIKey, config.APISecretKey, config.AccessToken, config.AccessTokenSecret)
+
+			twitterData := populateTemplate("twitter", weeklyData)
+			dp.sendTwitter(twitterData, weeklyData.Image)
+		}
 	}
 }
 
 func (dp *Dispatcher) SendMeetup(meetupData communityv1alpha1.MeetupSpec) {
-	telegramData := format("telegram", meetupData)
-	twitterData := format("twitter", meetupData)
+	if dp.config.Telegram.Enabled {
+		for _, config := range dp.config.Telegram.Group {
+			dp.telegramDispatcher.Start(config.Token, config.ChatID)
 
-	if dp.telegramEnabled {
-		dp.sendTelegram(telegramData, meetupData.Image)
+			telegramData := populateTemplate("telegram", meetupData)
+			dp.sendTelegram(telegramData, meetupData.Image)
+		}
 	}
 
-	if dp.twitterEnabled {
-		dp.sendTwitter(twitterData, meetupData.Image)
+	if dp.config.Twitter.Enabled {
+		for _, config := range dp.config.Twitter.Account {
+			dp.twitterDispacher.Start(config.APIKey, config.APISecretKey, config.AccessToken, config.AccessTokenSecret)
+
+			twitterData := populateTemplate("twitter", meetupData)
+			dp.sendTwitter(twitterData, meetupData.Image)
+		}
 	}
 }
 
 func (dp *Dispatcher) SendAnnouncement(announcementData communityv1alpha1.AnnouncementSpec) {
-	telegramData := format("telegram", announcementData)
-	twitterData := format("twitter", announcementData)
+	if dp.config.Telegram.Enabled {
+		for _, config := range dp.config.Telegram.Group {
+			dp.telegramDispatcher.Start(config.Token, config.ChatID)
 
-	if dp.telegramEnabled {
-		dp.sendTelegram(telegramData, announcementData.Image)
+			telegramData := populateTemplate("telegram", announcementData)
+			dp.sendTelegram(telegramData, announcementData.Image)
+		}
 	}
 
-	if dp.twitterEnabled {
-		dp.sendTwitter(twitterData, announcementData.Image)
+	if dp.config.Twitter.Enabled {
+		for _, config := range dp.config.Twitter.Account {
+			dp.twitterDispacher.Start(config.APIKey, config.APISecretKey, config.AccessToken, config.AccessTokenSecret)
+
+			twitterData := populateTemplate("twitter", announcementData)
+			dp.sendTwitter(twitterData, announcementData.Image)
+		}
 	}
 }
diff --git a/dispatcher/telegram.go b/dispatcher/telegram.go
diff --git a/dispatcher/twitter.go b/dispatcher/twitter.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
