Merge pull request #6 from Antosik/may24-update

Update
Antosik · May 31, 2024 · 0ff99a9 · 0ff99a9
2 parents 73f53b0 + df74f0a
commit 0ff99a9
Show file tree

Hide file tree

Showing 23 changed files with 181 additions and 172 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,28 +1,29 @@
 name: lint
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
+
+permissions:
+  contents: read
+  pull-requests: read
+  checks: write
 
 jobs:
   golangci:
     name: lint
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [1.18.x]
-        os: [ubuntu-latest]
+    runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Checkout code
-        uses: actions/checkout@v3
+          go-version: stable
 
       - name: Lint with golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: latest
+          version: v1.58
diff --git a/.golangci.yml b/.golangci.yml
@@ -5,12 +5,12 @@ run:
   modules-download-mode: readonly
   allow-parallel-runners: true
 
-output:
-  format: github-actions
+outputs:
+  format: colored-line-number
 
 linters:
   enable:
-    - golint
+    - revive
     - gosec
     - lll
     - wsl

diff --git a/Makefile b/Makefile
@@ -23,10 +23,22 @@ validate:
 		--template ./templates/sam.template.yaml \
 		--lint
 
+deploy-init:
+	sam deploy \
+		--stack-name rito-news-feeds-${STAGE} \
+		--config-env ${STAGE} \
+		--parameter-overrides \
+			ParameterKey=DomainName,ParameterValue=${DOMAIN_NAME} \
+			ParameterKey=BucketName,ParameterValue=${BUCKET_NAME} \
+			ParameterKey=DistributionId,ParameterValue=${DISTRIBUTION_ID} \
+			ParameterKey=Stage,ParameterValue=${STAGE} \
+		--capabilities CAPABILITY_NAMED_IAM \
+		--guided
+
 deploy:
 	sam deploy \
 		--stack-name rito-news-feeds-${STAGE} \
-		--config-file ./templates/samconfig.toml \
+		--config-file ./samconfig.toml \
 		--config-env ${STAGE} \
 		--parameter-overrides \
 			ParameterKey=DomainName,ParameterValue=${DOMAIN_NAME} \
@@ -99,8 +111,8 @@ build-LegendsOfRuneterraStatusChecker:
 	mv ./lorstatus $(ARTIFACTS_DIR)/bootstrap
 
 build-LegendsOfRuneterraNewsChecker:
-	GOARCH=amd64 GOOS=linux go build -trimpath -o ./lornews lor/news/main.go lor/news/utils.go
-	mv ./lornews $(ARTIFACTS_DIR)/lornews
+	GOARCH=arm64 GOOS=linux go build -trimpath -o ./lornews lor/news/main.go lor/news/utils.go
+	mv ./lornews $(ARTIFACTS_DIR)/bootstrap
 #endregion Build: Legends of Runeterra
 
 #region Build: Teamfight Tactics

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # rito-news-feeds
-[![Build status](https://img.shields.io/github/workflow/status/Antosik/rito-news-feeds/lint)](https://github.com/Antosik/rito-news-feeds/actions/workflows/lint.yml)
+[![Build status](https://img.shields.io/github/actions/workflow/status/Antosik/rito-news-feeds/lint.yml)](https://github.com/Antosik/rito-news-feeds/actions/workflow/lint.yml)
 
 ## Description
 This service generates an Atom, JSONFeed, RSS and raw JSON data from various official news sources about League of Legends, VALORANT, Legends of Runeterra, Teamfight Tactics, Wild Rift and Riot Games.

diff --git a/docs/en/league-of-legends/esports.md b/docs/en/league-of-legends/esports.md
@@ -5,7 +5,7 @@ The service generates files that contains the esports news from official League
 ## File URL
 The files url looks like
 ```
-https://rito-news.iamantosik.me/lol/{locale}/esports.{extension}
+https://data.rito.news/lol/{locale}/esports.{extension}
 ```
 
 ### Available locales
@@ -41,5 +41,5 @@ https://rito-news.iamantosik.me/lol/{locale}/esports.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for NA esports news - https://rito-news.iamantosik.me/lol/en-us/esports.rss
-- Raw esports news data for Korean server - https://rito-news.iamantosik.me/lol/ko-kr/esports.json
+- RSS for NA esports news - https://data.rito.news/lol/en-us/esports.rss
+- Raw esports news data for Korean server - https://data.rito.news/lol/ko-kr/esports.json
diff --git a/docs/en/league-of-legends/news.md b/docs/en/league-of-legends/news.md
@@ -5,7 +5,7 @@ The service generates files that contains the news from official League of Legen
 ## File URL
 The files url looks like
 ```
-https://rito-news.iamantosik.me/lol/{locale}/news.{extension}
+https://data.rito.news/lol/{locale}/news.{extension}
 ```
 
 ### Available locales
@@ -41,5 +41,5 @@ https://rito-news.iamantosik.me/lol/{locale}/news.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for NA news - https://rito-news.iamantosik.me/lol/en-us/news.rss
-- Raw news data for Korean server - https://rito-news.iamantosik.me/lol/ko-kr/news.json
+- RSS for NA news - https://data.rito.news/lol/en-us/news.rss
+- Raw news data for Korean server - https://data.rito.news/lol/ko-kr/news.json
diff --git a/docs/en/league-of-legends/server-status.md b/docs/en/league-of-legends/server-status.md
@@ -5,7 +5,7 @@ The service generates files that contains theserver status message from League o
 ## File URL
 The files url looks like
 ```
-https://rito-news.iamantosik.me/lol/{locale}/status.{server}.{extension}
+https://data.rito.news/lol/{locale}/status.{server}.{extension}
 ```
 
 ### Available servers and locales
@@ -61,5 +61,5 @@ https://rito-news.iamantosik.me/lol/{locale}/status.{server}.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for NA server status messages - https://rito-news.iamantosik.me/lol/en-us/status.na.rss
-- Raw server status data for Korean server - https://rito-news.iamantosik.me/lol/ko-kr/status.kr.json
+- RSS for NA server status messages - https://data.rito.news/lol/en-us/status.na.rss
+- Raw server status data for Korean server - https://data.rito.news/lol/ko-kr/status.kr.json
diff --git a/docs/en/legends-of-runeterra/news.md b/docs/en/legends-of-runeterra/news.md
@@ -5,7 +5,7 @@ The service generates files that contains the news from official Legends of Rune
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/lor/{locale}/news.{extension}
+https://data.rito.news/lor/{locale}/news.{extension}
 ```
 
 ### Available locales
@@ -33,5 +33,5 @@ https://rito-news.iamantosik.me/lor/{locale}/news.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for English locale news - https://rito-news.iamantosik.me/lor/en-us/news.rss
-- Raw news data for Korean locale - https://rito-news.iamantosik.me/lor/ko-kr/news.json
+- RSS for English locale news - https://data.rito.news/lor/en-us/news.rss
+- Raw news data for Korean locale - https://data.rito.news/lor/ko-kr/news.json
diff --git a/docs/en/legends-of-runeterra/server-status.md b/docs/en/legends-of-runeterra/server-status.md
@@ -5,7 +5,7 @@ The service generates files that contains theserver status message from Legends
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/lor/{locale}/status.{server}.{extension}
+https://data.rito.news/lor/{locale}/status.{server}.{extension}
 ```
 
 ### Available servers
@@ -37,5 +37,5 @@ https://rito-news.iamantosik.me/lor/{locale}/status.{server}.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for americas server status messages with english locale - https://rito-news.iamantosik.me/lor/en-us/status.americas.rss
-- Raw server status data for europe server with italian locale - https://rito-news.iamantosik.me/lor/it-it/status.europe.json
+- RSS for americas server status messages with english locale - https://data.rito.news/lor/en-us/status.americas.rss
+- Raw server status data for europe server with italian locale - https://data.rito.news/lor/it-it/status.europe.json
diff --git a/docs/en/riot-games/jobs.md b/docs/en/riot-games/jobs.md
@@ -6,7 +6,7 @@ The service generates files that contains the available jobs from official Riot
 ## File URL
 The files url looks like
 ```
-https://rito-news.iamantosik.me/riotgames/{locale}/jobs.{extension}
+https://data.rito.news/riotgames/{locale}/jobs.{extension}
 ```
 
 ### Available locales
@@ -43,5 +43,5 @@ https://rito-news.iamantosik.me/riotgames/{locale}/jobs.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for news in english locale - https://rito-news.iamantosik.me/riotgames/en/news.rss
-- Raw news data in korean - https://rito-news.iamantosik.me/riotgames/ko/news.json
+- RSS for news in english locale - https://data.rito.news/riotgames/en/news.rss
+- Raw news data in korean - https://data.rito.news/riotgames/ko/news.json
diff --git a/docs/en/riot-games/news.md b/docs/en/riot-games/news.md
@@ -5,12 +5,11 @@ The service generates files that contains the news from official Riot Games webs
 ## File URL
 The files url looks like
 ```
-https://rito-news.iamantosik.me/riotgames/{locale}/news.{extension}
+https://data.rito.news/riotgames/{locale}/news.{extension}
 ```
 
 ### Available locales
 - English (NA) - (`en`)
-- Indonesian - (`id`)
 - Malaysian - (`ms`)
 - Português - (`pt-br`)
 - Čeština - (`cs`)
@@ -39,5 +38,5 @@ https://rito-news.iamantosik.me/riotgames/{locale}/news.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for news in english locale - https://rito-news.iamantosik.me/riotgames/en/news.rss
-- Raw news data in korean - https://rito-news.iamantosik.me/riotgames/ko/news.json
+- RSS for news in english locale - https://data.rito.news/riotgames/en/news.rss
+- Raw news data in korean - https://data.rito.news/riotgames/ko/news.json
diff --git a/docs/en/teamfight-tactics/news.md b/docs/en/teamfight-tactics/news.md
@@ -5,7 +5,7 @@ The service generates files that contains the news from official Teamfight Tacti
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/tft/{locale}/news.{extension}
+https://data.rito.news/tft/{locale}/news.{extension}
 ```
 
 ### Available locales
@@ -40,5 +40,5 @@ https://rito-news.iamantosik.me/tft/{locale}/news.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS with italian locale - https://rito-news.iamantosik.me/tft/it-it/news.rss
-- Raw news data with korean locale - https://rito-news.iamantosik.me/tft/ko-kr/news.json
+- RSS with italian locale - https://data.rito.news/tft/it-it/news.rss
+- Raw news data with korean locale - https://data.rito.news/tft/ko-kr/news.json
diff --git a/docs/en/valorant/esports.md b/docs/en/valorant/esports.md
@@ -5,7 +5,7 @@ The service generates files that contains the esports news from official VALORAN
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/val/{locale}/esports.{extension}
+https://data.rito.news/val/{locale}/esports.{extension}
 ```
 
 ### Available locales
@@ -37,5 +37,5 @@ https://rito-news.iamantosik.me/val/{locale}/esports.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS with italian locale - https://rito-news.iamantosik.me/val/it-it/esports.rss
-- Raw news data with korean locale - https://rito-news.iamantosik.me/val/ko-kr/esports.json
+- RSS with italian locale - https://data.rito.news/val/it-it/esports.rss
+- Raw news data with korean locale - https://data.rito.news/val/ko-kr/esports.json
diff --git a/docs/en/valorant/news.md b/docs/en/valorant/news.md
@@ -5,7 +5,7 @@ The service generates files that contains the news from official VALORANT websit
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/val/{locale}/news.{extension}
+https://data.rito.news/val/{locale}/news.{extension}
 ```
 
 ### Available locales
@@ -35,5 +35,5 @@ https://rito-news.iamantosik.me/val/{locale}/news.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS with italian locale - https://rito-news.iamantosik.me/val/it-it/news.rss
-- Raw news data with korean locale - https://rito-news.iamantosik.me/val/ko-kr/news.json
+- RSS with italian locale - https://data.rito.news/val/it-it/news.rss
+- Raw news data with korean locale - https://data.rito.news/val/ko-kr/news.json
diff --git a/docs/en/valorant/server-status.md b/docs/en/valorant/server-status.md
@@ -5,7 +5,7 @@ The service generates files that contains theserver status message from VALORANT
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/val/{locale}/status.{server}.{extension}
+https://data.rito.news/val/{locale}/status.{server}.{extension}
 ```
 
 ### Available servers
@@ -44,5 +44,5 @@ https://rito-news.iamantosik.me/val/{locale}/status.{server}.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for north america server status messages with english locale - https://rito-news.iamantosik.me/val/en-us/status.na.rss
-- Raw server status data for europe server with italian locale - https://rito-news.iamantosik.me/val/it-it/status.eu.json
+- RSS for north america server status messages with english locale - https://data.rito.news/val/en-us/status.na.rss
+- Raw server status data for europe server with italian locale - https://data.rito.news/val/it-it/status.eu.json
diff --git a/docs/en/wild-rift/esports.md b/docs/en/wild-rift/esports.md
@@ -5,7 +5,7 @@ The service generates files that contains the esports news from official Wild Ri
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/wr/{locale}/esports.{extension}
+https://data.rito.news/wr/{locale}/esports.{extension}
 ```
 
 ### Available locales
@@ -40,5 +40,5 @@ https://rito-news.iamantosik.me/wr/{locale}/esports.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS with italian locale - https://rito-news.iamantosik.me/wr/it-it/esports.rss
-- Raw news data with korean locale - https://rito-news.iamantosik.me/wr/ko-kr/esports.json
+- RSS with italian locale - https://data.rito.news/wr/it-it/esports.rss
+- Raw news data with korean locale - https://data.rito.news/wr/ko-kr/esports.json
diff --git a/docs/en/wild-rift/news.md b/docs/en/wild-rift/news.md
@@ -5,7 +5,7 @@ The service generates files that contains the news from official Wild Rift websi
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/wr/{locale}/news.{extension}
+https://data.rito.news/wr/{locale}/news.{extension}
 ```
 
 ### Available locales
@@ -37,5 +37,5 @@ https://rito-news.iamantosik.me/wr/{locale}/news.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS with italian locale - https://rito-news.iamantosik.me/wr/it-it/news.rss
-- Raw news data with korean locale - https://rito-news.iamantosik.me/wr/ko-kr/news.json
+- RSS with italian locale - https://data.rito.news/wr/it-it/news.rss
+- Raw news data with korean locale - https://data.rito.news/wr/ko-kr/news.json
diff --git a/docs/en/wild-rift/server-status.md b/docs/en/wild-rift/server-status.md
@@ -5,7 +5,7 @@ The service generates files that contains theserver status message from Wild Rif
 ## File URL
 The file url should be formed like
 ```
-https://rito-news.iamantosik.me/wr/{locale}/status.{server}.{extension}
+https://data.rito.news/wr/{locale}/status.{server}.{extension}
 ```
 
 ### Available servers
@@ -47,5 +47,5 @@ https://rito-news.iamantosik.me/wr/{locale}/status.{server}.{extension}
 - Raw data (`.json`)
 
 ### Examples
-- RSS for north america server status messages with english locale - https://rito-news.iamantosik.me/wr/en-us/status.na.rss
-- Raw server status data for europe server with italian locale - https://rito-news.iamantosik.me/wr/it-it/status.eu.json
+- RSS for north america server status messages with english locale - https://data.rito.news/wr/en-us/status.na.rss
+- Raw server status data for europe server with italian locale - https://data.rito.news/wr/it-it/status.eu.json