Skip to content

Commit e0752ef

Browse files
authored
Merge pull request #45 from nulab/auth-header-from-settings-file
Auth header from settings file
2 parents 61a0ef2 + cc5c22b commit e0752ef

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: coursier/cache-action@v6
3131

3232
- name: Set header
33-
run: sed -i -e 's/iaahStr = ""/iaahStr = "${{ secrets.IAAH }}"/' src/main/scala/com/nulabinc/backlog/r2b/Main.scala
33+
run: sed -i -e 's/internal.getString("application.iaah")/"${{ secrets.IAAH }}"/' common/core/src/main/scala/com/nulabinc/backlog/migration/common/conf/BacklogConfiguration.scala
3434

3535
- name: Check format
3636
run: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ app.properties
1616
metals.sbt
1717

1818
data.db
19+
local.conf

src/main/resources/application.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ application {
2121
export-limit-at-once = 100
2222
language=default
2323
akka.mailbox-pool = 100
24+
iaah = ""
2425
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
include "application.conf"
2+
3+
application {
4+
iaah = ""
5+
}

src/main/scala/com/nulabinc/backlog/r2b/Main.scala

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ object R2B extends BacklogConfiguration with Logging {
3838

3939
private val dbPath = Paths.get("./backlog/data.db")
4040

41-
private final val iaahStr = ""
42-
private final val iaah = IAAH(iaahStr)
43-
4441
private implicit val system: ActorSystem = ActorSystem("main")
4542
private implicit val exc: Scheduler =
4643
monix.execution.Scheduler.Implicits.global
@@ -201,8 +198,7 @@ object R2B extends BacklogConfiguration with Logging {
201198
backlogConfig = BacklogApiConfiguration(
202199
url = cli.execute.backlogUrl(),
203200
key = cli.execute.backlogKey(),
204-
projectKey = backlog,
205-
iaah = cli.execute.iaah.getOrElse(iaah)
201+
projectKey = backlog
206202
),
207203
exclude = exclude,
208204
importOnly = cli.execute.importOnly(),

src/test/scala/integration/helper/SimpleFixture.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import java.nio.file.Path
55
import java.text.SimpleDateFormat
66
import java.util.{Date, Locale, Properties}
77

8-
import com.nulabinc.backlog.migration.common.client.IAAH
98
import com.nulabinc.backlog.migration.common.conf.{
109
BacklogApiConfiguration,
1110
ExcludeOption,
@@ -167,11 +166,10 @@ trait SimpleFixture {
167166
key = redmineKey,
168167
projectKey = redmine
169168
),
170-
backlogConfig = new BacklogApiConfiguration(
169+
backlogConfig = BacklogApiConfiguration(
171170
url = backlogUrl,
172171
key = backlogKey,
173-
projectKey = backlog,
174-
iaah = IAAH.empty
172+
projectKey = backlog
175173
),
176174
exclude = ExcludeOption.default,
177175
importOnly = false,

0 commit comments

Comments
 (0)