Commit 11c0c1f4 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch 'staging' into 'OCF123-interfacedetails-from-security-service' 

# Conflicts:
#   services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py
#   tests/libraries/security_api/bodyRequests.py
parents ac1446b8 52c277d6

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -37,3 +37,4 @@ results 


helm/capif/*.lock

helm/capif/charts/tempo*

*.bak
 
 No newline at end of file

.gitlab/issue_templates/default.md

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Proposers



- name-of-proposer-1 (institution-of-proposer-1)

- name-of-proposer-2 (institution-of-proposer-2)

...



# Description



Describe your proposal in ~1000 characters.

You can reference external content listed in section "References" as [Ref-1].



# Demo or definition of done



Describe which high level conditions needs to be fulfilled to demonstrate this feature implementation is completed.

You can reference external content (example, demo paper) listed in section "References" as [Ref-2].



# References



1. [Reference name](https://reference-url)

2. Author1, Author2, Author3, et. al., “My demo using feature,” in Conference-Name Demo Track, 20XX.



# Acknowledgements

This work is funded by the European Commission through the <European project id> project with Grant Agreement number <Agreement Number>.

```example HORIZON-JU-SNS-2022 FLEX-SCALE project with Grant Agreement number 101096909.```

.gitlab/merge_request_templates/Default.md

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Proposers



- name-of-proposer-1 (institution-of-proposer-1)

- name-of-proposer-2 (institution-of-proposer-2)

...



# Description



Describe your proposal in ~1000 characters.

You can reference external content listed in section "References" as [Ref-1].



# Demo or definition of done



Describe which high level conditions needs to be fulfilled to demonstrate this feature implementation is completed.

You can reference external content (example, demo paper) listed in section "References" as [Ref-2].



# References



1. [Reference name](https://reference-url)

2. Author1, Author2, Author3, et. al., “My demo using feature,” in Conference-Name Demo Track, 20XX.



# Acknowledgements

This work is funded by the European Commission through the <European project id> project with Grant Agreement number <Agreement Number>.

```example HORIZON-JU-SNS-2022 FLEX-SCALE project with Grant Agreement number 101096909.```

helm/capif/charts/ocf-helper/templates/ocf-helper-configmap.yaml

+6 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ data: 
      'col_services': "serviceapidescriptions",

      'col_security': "security",

      'col_event': "eventsdetails",

      'col_capif_configuration': "capif_configuration",

      'host': '{{ .Values.env.mongoHost }}',

      'port': "{{ .Values.env.mongoPort }}"

    }
@@ -22,3 +23,7 @@ data: 
      "port": {{ quote .Values.env.vaultPort }},

      "token": {{ quote .Values.env.vaultAccessToken }}

    }



    {{- if .Values.capifConfiguration }}

    capif_configuration: {{ .Values.capifConfiguration | toYaml | nindent 6 }}

    {{- end }}
 
 No newline at end of file

helm/capif/charts/ocf-helper/values.yaml

+18 −0
Original line number Diff line number Diff line
@@ -25,6 +25,24 @@ env: 
  mongoInitdbRootPassword: example

  logLevel: "INFO"



capifConfiguration:

  config_name: "default"

  config_version: "1.0"

  config_description: "Default CAPIF Configuration"

  settings:

    certificates_expiry:

      ttl_superadmin_cert: "4300h"

      ttl_invoker_cert: "4300h"

      ttl_provider_cert: "4300h"

    security_method_priority:

      oauth: 1

      pki: 2

      psk: 3

    acl_policy_settings:

      allowed_total_invocations: 5

      allowed_invocations_per_second: 10

      allowed_invocation_time_range_days: 365



serviceAccount:

  # Specifies whether a service account should be created

  create: true