More envs. Use same prop everywhere.

Author: gunnarvelle

.github/workflows/typescript-generate.yml

@@ -23,9 +23,9 @@ env:
   META_PASSWORD: ""
   META_RESOURCE: ""
   META_SERVER: ""
-  META_PORT: ""
+  META_PORT: 5432
   META_SCHEMA: ""
-  META_MAX_CONNECTIONS: ""
+  META_MAX_CONNECTIONS: 1
 jobs:
   generate_typescript:
     name: Generate typescript types

article-api/src/main/scala/no/ndla/articleapi/ArticleApiProperties.scala

@@ -71,8 +71,8 @@ class ArticleApiProperties extends BaseProps with DatabaseProps {
     ).getOrElse(Environment, "https://h5p.ndla.no")
   )
 
-  private def BrightcoveAccountId: String = prop("NDLA_BRIGHTCOVE_ACCOUNT_ID")
-  private def BrightcovePlayerId: String  = prop("NDLA_BRIGHTCOVE_PLAYER_ID")
+  private def BrightcoveAccountId: String = prop("BRIGHTCOVE_ACCOUNT_ID")
+  private def BrightcovePlayerId: String  = prop("BRIGHTCOVE_PLAYER_ID")
 
   def BrightcoveVideoScriptUrl: String =
     s"//players.brightcove.net/$BrightcoveAccountId/${BrightcovePlayerId}_default/index.min.js"

draft-api/src/main/scala/no/ndla/draftapi/DraftApiProperties.scala

@@ -50,8 +50,8 @@ class DraftApiProperties extends BaseProps with DatabaseProps with StrictLogging
   def InlineHtmlTags: Set[String]       = Set("code", "em", "span", "sub", "sup")
   def IntroductionHtmlTags: Set[String] = InlineHtmlTags ++ Set("br", "p", "strong")
 
-  private def BrightcoveAccountId: String = prop("NDLA_BRIGHTCOVE_ACCOUNT_ID")
-  private def BrightcovePlayerId: String  = prop("NDLA_BRIGHTCOVE_PLAYER_ID")
+  private def BrightcoveAccountId: String = prop("BRIGHTCOVE_ACCOUNT_ID")
+  private def BrightcovePlayerId: String  = prop("BRIGHTCOVE_PLAYER_ID")
 
   def BrightcoveVideoScriptUrl: String =
     s"//players.brightcove.net/$BrightcoveAccountId/${BrightcovePlayerId}_default/index.min.js"

frontpage-api/src/main/scala/no/ndla/frontpageapi/FrontpageApiProperties.scala

@@ -29,8 +29,8 @@ class FrontpageApiProperties extends BaseProps with DatabaseProps {
   val Domain: String         = propOrElse("BACKEND_API_DOMAIN", Domains.get(Environment))
   val RawImageApiUrl: String = s"$Domain/image-api/raw"
 
-  val BrightcoveAccountId: String = prop("BRIGHTCOVE_ACCOUNT")
-  val BrightcovePlayer: String    = prop("BRIGHTCOVE_PLAYER")
+  val BrightcoveAccountId: String = prop("BRIGHTCOVE_ACCOUNT_ID")
+  val BrightcovePlayer: String    = prop("BRIGHTCOVE_PLAYER_ID")
 
   override def MetaMigrationLocation: String = "no/ndla/frontpageapi/db/migration"
 }