Next release conflict fixed

README.md

@@ -85,9 +85,8 @@ API-palvelimen saa käyntiin kehitysmoodiin seuraavalla sbt komennolla:
 ./sbt '~;container:start; container:reload /'
 ```
 
-Salasanat voidaan syöttää ympäristömuuttujina myös.
-Parametri voidaan asettaa Intellij SBT Configuration Environment Variable.
-Nämä voidaan syöttään myös ympäristömuuttujina.
+Ympäristömuuttuja parametri voidaan asettaa Intellij SBT Configuration Environment Variable avulla.
+Nämä voidaan syöttään myös ympäristömuuttujina:
 ```
 viiteRestApiEndPoint=url
 viite.apikey=insertapikey
@@ -102,6 +101,7 @@ ses.password=sespassword
 bonecp.jdbcUrl=kantaurl
 bonecp.username=kantakäyttäjä
 bonecp.password=kantasalasana
+vvhRest.password=insertpassword
 ```
 Windowsissa toimii komento:
 ```

aws/cloud-formation/batchSystem/DEVbatchJobDefinition.json

@@ -22,7 +22,7 @@
         "value": "4"
       }
     ],
-    "executionRoleArn": "arn:aws:iam::475079312496:role/batchSystem-BatchTaskRole-GSUD7E3H8KV4",
+    "executionRoleArn": "arn:aws:iam::475079312496:role/DEV-batchSystem-BatchTaskRole-VGL42N9TANTI",
     "environment": [
       {
         "name": "containerCPU",
@@ -50,11 +50,15 @@
       },
       {
         "name": "vvhServiceHost",
-        "value": "haproxy.vayla.fi"
+        "value": "api.vayla.fi"
       },
       {
         "name": "vvhRestApiEndPoint",
-        "value": "https://haproxy.vayla.fi:2027/vvhdata/"
+        "value": "https://api.vayla.fi/vvhdata/"
+      },
+      {
+        "name": "vvhRest.username",
+        "value": "svc_vvh_digiroad"
       },
       {
         "name": "vvhRoadlink.frozen",
@@ -132,6 +136,10 @@
         "name": "bonecp.password",
         "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/dev/bonecp.password"
       },
+      {
+        "name": "vvhRest.password",
+        "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/dev/vvhRest.password"
+      },
       {
         "name": "oag.password",
         "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/dev/authentication.oag.basic.password"

aws/cloud-formation/batchSystem/ProdBatchJobDefinition.json

@@ -11,7 +11,7 @@
     "FARGATE"
   ],
   "containerProperties": {
-    "image": "475079312496.dkr.ecr.eu-west-1.amazonaws.com/digiroad2:prod",
+    "image": "920408837790.dkr.ecr.eu-west-1.amazonaws.com/digiroad2:prod",
     "resourceRequirements" : [
       {
         "type": "MEMORY",
@@ -22,7 +22,7 @@
         "value": "4"
       }
     ],
-    "executionRoleArn": "arn:aws:iam::475079312496:role/batchSystem-BatchTaskRole-GSUD7E3H8KV4",
+    "executionRoleArn": "arn:aws:iam::920408837790:role/digiroad-batch-system-BatchTaskRole-NTGCBVRU7CCR",
     "environment": [
       {
         "name": "containerCPU",
@@ -50,11 +50,15 @@
       },
       {
         "name": "vvhServiceHost",
-        "value": "haproxy.vayla.fi"
+        "value": "api.vayla.fi"
       },
       {
         "name": "vvhRestApiEndPoint",
-        "value": "https://haproxy.vayla.fi:2027/vvhdata/"
+        "value": "https://api.vayla.fi/vvhdata/"
+      },
+      {
+        "name": "vvhRest.username",
+        "value": "svc_vvh_digiroad"
       },
       {
         "name": "vvhRoadlink.frozen",
@@ -106,7 +110,7 @@
       },
       {
         "name": "caching",
-        "value": "false"
+        "value": "true"
       },
       {
         "name": "cacheHostname",
@@ -130,19 +134,24 @@
     "secrets": [
       {
         "name": "bonecp.password",
-        "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/prod/bonecp.password"
+        "valueFrom": "arn:aws:ssm:eu-west-1:920408837790:parameter/prod/bonecp.password"
+      },
+      {
+        "name": "vvhRest.password",
+        "valueFrom": "arn:aws:ssm:eu-west-1:920408837790:parameter/prod/vvhRest.password"
       },
       {
         "name": "oag.password",
-        "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/prod/authentication.oag.basic.password"
+        "valueFrom": "arn:aws:ssm:eu-west-1:920408837790:parameter/prod/authentication.oag.basic.password"
       },
+
       {
         "name": "viite.apikey",
-        "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/prod/apikey/viite"
+        "valueFrom": "arn:aws:ssm:eu-west-1:920408837790:parameter/prod/apikey/viite"
       },
       {
         "name": "vkm.apikey",
-        "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/prod/apikey/viitekehysmuunnin"
+        "valueFrom": "arn:aws:ssm:eu-west-1:920408837790:parameter/prod/apikey/viitekehysmuunnin"
       }
     ]
   }

aws/cloud-formation/batchSystem/QAbatchJobDefinition.json

@@ -22,7 +22,7 @@
         "value": "4"
       }
     ],
-    "executionRoleArn": "arn:aws:iam::475079312496:role/batchSystem-BatchTaskRole-GSUD7E3H8KV4",
+    "executionRoleArn": "arn:aws:iam::475079312496:role/QA-batchSystem-BatchTaskRole-1QO0VDAJOYS45",
     "environment": [
       {
         "name": "containerCPU",
@@ -50,11 +50,15 @@
       },
       {
         "name": "vvhServiceHost",
-        "value": "haproxy.vayla.fi"
+        "value": "api.vayla.fi"
       },
       {
         "name": "vvhRestApiEndPoint",
-        "value": "https://haproxy.vayla.fi:2027/vvhdata/"
+        "value": "https://api.vayla.fi/vvhdata/"
+      },
+      {
+        "name": "vvhRest.username",
+        "value": "svc_vvh_digiroad"
       },
       {
         "name": "vvhRoadlink.frozen",
@@ -106,7 +110,7 @@
       },
       {
         "name": "caching",
-        "value": "false"
+        "value": "true"
       },
       {
         "name": "cacheHostname",
@@ -132,6 +136,10 @@
         "name": "bonecp.password",
         "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/qa/bonecp.password"
       },
+      {
+        "name": "vvhRest.password",
+        "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/qa/vvhRest.password"
+      },
       {
         "name": "oag.password",
         "valueFrom": "arn:aws:ssm:eu-west-1:475079312496:parameter/qa/authentication.oag.basic.password"

aws/cloud-formation/batchSystem/batchLambda/batchLambda.yaml

@@ -0,0 +1,82 @@
+AWSTemplateFormatVersion: "2010-09-09"
+Parameters:
+  BucketName:
+    Description: Name of S3 bucket for lambda code
+    Type: String
+  S3ObjectKey:
+    Description: Key of lambda deployment object
+    Type: String
+  EnvironmentName:
+    Description: Name of AWS account dev or prod
+    Type: String
+  Owner:
+    Description: "Owner of the of application, that these resources are created for. Used when tagging the resources"
+    Type: String
+  Project:
+    Description: "Project of the of application, that these resources are created for. Used when tagging the resources"
+    Type: String
+  ApplicationName:
+    Description: Name of the application (no whitespace or special characters)
+    Type: String
+
+Resources:
+  BatchLambda:
+    Type: AWS::Lambda::Function
+    Properties:
+      Code:
+        S3Bucket: !Ref BucketName
+        S3Key: !Ref S3ObjectKey
+      Tags:
+        - Key: Name
+          Value: !Join [ '-', [ !Ref EnvironmentName, !Ref ApplicationName, 'batchLambda' ] ]
+        - Key: Environment
+          Value: !Ref EnvironmentName
+        - Key: Owner
+          Value: !Ref Owner
+        - Key: Project
+          Value: !Ref Project
+      FunctionName: "Batch-Add-Jobs-To-Queue-New"
+      Handler: AddJobToQueue.handler
+      Role: !GetAtt BatchLambdaRole.Arn
+      Runtime: nodejs14.x
+
+  BatchLambdaRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Effect: "Allow"
+            Principal:
+              Service: "lambda.amazonaws.com"
+            Action:
+              - 'sts:AssumeRole'
+      Policies:
+        - PolicyName: "dev-batch-lambda-policy"
+          PolicyDocument:
+            Statement:
+              - Effect: "Allow"
+                Resource: "*"
+                Action:
+                  - 'logs:CreateLogStream'
+                  - 'logs:PutLogEvents'
+                  - 'batch:DescribeJobs'
+                  - 'batch:SubmitJob'
+                  - 'batch:ListJobs'
+
+      Tags:
+        - Key: Name
+          Value: !Join [ '-', [ !Ref EnvironmentName, !Ref ApplicationName,  'batchLambdaRole' ] ]
+        - Key: Environment
+          Value: !Ref EnvironmentName
+        - Key: Owner
+          Value: !Ref Owner
+        - Key: Project
+          Value: !Ref Project
+
+Outputs:
+  BatchLambdaOutput:
+    Description: Arn of lambda for adding jobs to queue
+    Value: !GetAtt BatchLambda.Arn
+    Export:
+      Name: !Sub "BatchLambdaID"

aws/cloud-formation/batchSystem/batchLambda/cicd/dev-batch-lambda-pipeline-parameter.json

@@ -0,0 +1,22 @@
+[
+  {
+    "ParameterKey": "DevBucketName",
+    "ParameterValue": "dev-batch-lambda-deployment-bucket"
+  },
+  {
+    "ParameterKey": "ProdBucketName",
+    "ParameterValue": "prod-batch-lambda-deployment-bucket"
+  },
+  {
+    "ParameterKey": "LambdaCodeS3Key",
+    "ParameterValue": "deployment_package.zip"
+  },
+  {
+    "ParameterKey": "CodeCommitRepositoryName",
+    "ParameterValue": "Batch-Lambda"
+  },
+  {
+    "ParameterKey": "CodeCommitBranch",
+    "ParameterValue": "master"
+  }
+]