@aifabrix/builder 2.61.2 → 2.63.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/applications.api.js +22 -2
- package/lib/api/bootstrap-snapshot.api.js +115 -0
- package/lib/api/onboarding-status.api.js +117 -0
- package/lib/app/deploy.js +14 -5
- package/lib/app/register.js +24 -2
- package/lib/app/run-env-compose.js +44 -8
- package/lib/app/run-env-recovery.js +1 -0
- package/lib/app/run-helpers.js +1 -1
- package/lib/app/run.js +6 -4
- package/lib/build/standard-docker-build.js +4 -0
- package/lib/channels/channel-artifact-generator.js +13 -3
- package/lib/cli/infra-guided-footers.js +10 -8
- package/lib/cli/infra-guided.js +60 -12
- package/lib/cli/setup-infra-up-platform-action.js +14 -1
- package/lib/cli/setup-platform.js +20 -3
- package/lib/commands/auth-config.js +2 -0
- package/lib/commands/login.js +4 -0
- package/lib/commands/repair-datasource-apply.js +3 -1
- package/lib/commands/repair-datasource-legacy.js +94 -0
- package/lib/commands/setup-image-refresh.js +26 -0
- package/lib/commands/setup-modes.js +9 -2
- package/lib/commands/setup-onboarding-readiness.js +83 -0
- package/lib/commands/setup-prompts-platform-mode.js +34 -0
- package/lib/commands/setup.js +35 -10
- package/lib/commands/up-builder-api.js +24 -8
- package/lib/commands/up-common.js +16 -1
- package/lib/commands/up-dataplane-bootstrap.js +149 -16
- package/lib/commands/up-dataplane-credentials.js +21 -0
- package/lib/commands/up-dataplane.js +26 -34
- package/lib/commands/up-integration-server.js +112 -0
- package/lib/commands/wizard-config-normalizer.js +5 -1
- package/lib/core/admin-secrets-env-overlay.js +8 -3
- package/lib/core/environment-access-policy.js +121 -0
- package/lib/core/environment-mode-policy.js +177 -0
- package/lib/core/local-env-overrides.js +149 -0
- package/lib/core/secrets-ensure.js +4 -2
- package/lib/core/secrets-env-content.js +12 -9
- package/lib/core/secrets-env-write.js +1 -1
- package/lib/datasource/capability/capability-manifest.js +1 -0
- package/lib/deployment/installation/index.js +14 -1
- package/lib/deployment/installation/infra-catalog.js +3 -0
- package/lib/deployment/installation/local-environment-stage.js +285 -0
- package/lib/deployment/installation/local-installation.js +76 -0
- package/lib/deployment/installation/stage-input.js +5 -1
- package/lib/generator/builders.js +3 -1
- package/lib/generator/index.js +32 -9
- package/lib/generator/split-variables.js +2 -2
- package/lib/parameters/database-adoption.js +125 -0
- package/lib/parameters/physical-database-naming.js +136 -0
- package/lib/parameters/physical-secret-name.js +194 -0
- package/lib/parameters/rsa-secret-values.js +165 -0
- package/lib/programmatic/run-channel-install-artifacts.js +28 -2
- package/lib/programmatic/run-channel-package.js +3 -1
- package/lib/programmatic/workspace-context.js +37 -2
- package/lib/schema/infra.parameter.yaml +61 -27
- package/lib/schema/infrastructure-schema.json +213 -120
- package/lib/utils/compose-generate-docker-compose.js +2 -2
- package/lib/utils/compose-generator.js +4 -7
- package/lib/utils/compose-miso-env.js +2 -2
- package/lib/utils/compose-traefik-ingress-base.js +3 -4
- package/lib/utils/dataplane-dimension-abac-setting.js +120 -0
- package/lib/utils/declarative-url-ports.js +3 -0
- package/lib/utils/env-environment-file-paths.js +105 -0
- package/lib/utils/environment-scoped-resources.js +48 -14
- package/lib/utils/log-redaction.js +4 -1
- package/lib/utils/paths-system-builder-keys.js +7 -1
- package/lib/utils/paths.js +7 -2
- package/lib/utils/postgres-platform-bootstrap.js +35 -1
- package/lib/utils/redis-env-scope.js +21 -1
- package/lib/utils/registry-auth-sources.js +154 -0
- package/lib/utils/registry-credentials.js +131 -14
- package/lib/utils/secrets-generator.js +30 -21
- package/lib/utils/secrets-helpers.js +5 -7
- package/lib/utils/secrets-kv-scope.js +127 -28
- package/lib/utils/secrets-materialize-local.js +9 -0
- package/lib/utils/secrets-missing-error.js +35 -1
- package/lib/utils/token-manager.js +14 -8
- package/lib/utils/url-public-path-prefix.js +6 -10
- package/package.json +4 -2
- package/templates/README.md +6 -0
- package/templates/applications/builder-api/application.yaml +1 -1
- package/templates/applications/dataplane/application.yaml +2 -2
- package/templates/applications/dataplane/env.template +1 -1
- package/templates/applications/integration-server/application.yaml +91 -0
- package/templates/applications/integration-server/env.template +215 -0
- package/templates/applications/mirrored-templates.json +52 -0
- package/templates/applications/miso-controller/application.yaml +43 -1
- package/templates/applications/miso-controller/env.template +45 -39
- package/templates/marketplace/createUiDefinition.json +52 -4
- package/templates/marketplace/main.json +85 -7
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"key": "infrastructure-schema",
|
|
8
8
|
"name": "Installation Infrastructure Manifest Schema",
|
|
9
9
|
"description": "JSON schema for infrastructure/<resource-group>/environment-infra.json",
|
|
10
|
-
"version": "2.
|
|
10
|
+
"version": "2.2.0",
|
|
11
11
|
"type": "schema",
|
|
12
12
|
"category": "infrastructure",
|
|
13
13
|
"author": "AI Fabrix Team",
|
|
@@ -519,7 +519,57 @@
|
|
|
519
519
|
"keycloakImageTag"
|
|
520
520
|
],
|
|
521
521
|
"properties": {
|
|
522
|
-
"
|
|
522
|
+
"acrAdminPassword": {
|
|
523
|
+
"type": "object",
|
|
524
|
+
"required": [
|
|
525
|
+
"value",
|
|
526
|
+
"source",
|
|
527
|
+
"description"
|
|
528
|
+
],
|
|
529
|
+
"additionalProperties": false,
|
|
530
|
+
"properties": {
|
|
531
|
+
"value": {
|
|
532
|
+
"const": ""
|
|
533
|
+
},
|
|
534
|
+
"source": {
|
|
535
|
+
"type": "string",
|
|
536
|
+
"minLength": 1
|
|
537
|
+
},
|
|
538
|
+
"description": {
|
|
539
|
+
"type": "string",
|
|
540
|
+
"minLength": 1
|
|
541
|
+
},
|
|
542
|
+
"required": {
|
|
543
|
+
"type": "boolean"
|
|
544
|
+
}
|
|
545
|
+
}
|
|
546
|
+
},
|
|
547
|
+
"acrAdminUsername": {
|
|
548
|
+
"type": "object",
|
|
549
|
+
"required": [
|
|
550
|
+
"value",
|
|
551
|
+
"source",
|
|
552
|
+
"description"
|
|
553
|
+
],
|
|
554
|
+
"additionalProperties": false,
|
|
555
|
+
"properties": {
|
|
556
|
+
"value": {
|
|
557
|
+
"const": ""
|
|
558
|
+
},
|
|
559
|
+
"source": {
|
|
560
|
+
"type": "string",
|
|
561
|
+
"minLength": 1
|
|
562
|
+
},
|
|
563
|
+
"description": {
|
|
564
|
+
"type": "string",
|
|
565
|
+
"minLength": 1
|
|
566
|
+
},
|
|
567
|
+
"required": {
|
|
568
|
+
"type": "boolean"
|
|
569
|
+
}
|
|
570
|
+
}
|
|
571
|
+
},
|
|
572
|
+
"acrLoginServer": {
|
|
523
573
|
"type": "object",
|
|
524
574
|
"required": [
|
|
525
575
|
"value",
|
|
@@ -531,10 +581,7 @@
|
|
|
531
581
|
"value": {
|
|
532
582
|
"type": [
|
|
533
583
|
"string",
|
|
534
|
-
"
|
|
535
|
-
"number",
|
|
536
|
-
"object",
|
|
537
|
-
"array"
|
|
584
|
+
"null"
|
|
538
585
|
]
|
|
539
586
|
},
|
|
540
587
|
"source": {
|
|
@@ -550,7 +597,7 @@
|
|
|
550
597
|
}
|
|
551
598
|
}
|
|
552
599
|
},
|
|
553
|
-
"
|
|
600
|
+
"acrResourceId": {
|
|
554
601
|
"type": "object",
|
|
555
602
|
"required": [
|
|
556
603
|
"value",
|
|
@@ -562,10 +609,7 @@
|
|
|
562
609
|
"value": {
|
|
563
610
|
"type": [
|
|
564
611
|
"string",
|
|
565
|
-
"
|
|
566
|
-
"number",
|
|
567
|
-
"object",
|
|
568
|
-
"array"
|
|
612
|
+
"null"
|
|
569
613
|
]
|
|
570
614
|
},
|
|
571
615
|
"source": {
|
|
@@ -581,7 +625,7 @@
|
|
|
581
625
|
}
|
|
582
626
|
}
|
|
583
627
|
},
|
|
584
|
-
"
|
|
628
|
+
"adminEmail": {
|
|
585
629
|
"type": "object",
|
|
586
630
|
"required": [
|
|
587
631
|
"value",
|
|
@@ -612,7 +656,10 @@
|
|
|
612
656
|
}
|
|
613
657
|
}
|
|
614
658
|
},
|
|
615
|
-
"
|
|
659
|
+
"adminPassword": {
|
|
660
|
+
"$ref": "#/definitions/envReference"
|
|
661
|
+
},
|
|
662
|
+
"allowedIPs": {
|
|
616
663
|
"type": "object",
|
|
617
664
|
"required": [
|
|
618
665
|
"value",
|
|
@@ -623,11 +670,42 @@
|
|
|
623
670
|
"properties": {
|
|
624
671
|
"value": {
|
|
625
672
|
"type": [
|
|
626
|
-
"string",
|
|
627
673
|
"boolean",
|
|
628
|
-
"number",
|
|
629
|
-
"object",
|
|
630
674
|
"array"
|
|
675
|
+
],
|
|
676
|
+
"items": {
|
|
677
|
+
"type": "string",
|
|
678
|
+
"pattern": "^[0-9./*-]+$"
|
|
679
|
+
}
|
|
680
|
+
},
|
|
681
|
+
"source": {
|
|
682
|
+
"type": "string",
|
|
683
|
+
"minLength": 1
|
|
684
|
+
},
|
|
685
|
+
"description": {
|
|
686
|
+
"type": "string",
|
|
687
|
+
"minLength": 1
|
|
688
|
+
},
|
|
689
|
+
"required": {
|
|
690
|
+
"type": "boolean"
|
|
691
|
+
}
|
|
692
|
+
}
|
|
693
|
+
},
|
|
694
|
+
"capacityProfile": {
|
|
695
|
+
"type": "object",
|
|
696
|
+
"required": [
|
|
697
|
+
"value",
|
|
698
|
+
"source",
|
|
699
|
+
"description"
|
|
700
|
+
],
|
|
701
|
+
"additionalProperties": false,
|
|
702
|
+
"properties": {
|
|
703
|
+
"value": {
|
|
704
|
+
"enum": [
|
|
705
|
+
"s",
|
|
706
|
+
"m",
|
|
707
|
+
"l",
|
|
708
|
+
"xl"
|
|
631
709
|
]
|
|
632
710
|
},
|
|
633
711
|
"source": {
|
|
@@ -643,7 +721,7 @@
|
|
|
643
721
|
}
|
|
644
722
|
}
|
|
645
723
|
},
|
|
646
|
-
"
|
|
724
|
+
"deployRegistryRoleAssignment": {
|
|
647
725
|
"type": "object",
|
|
648
726
|
"required": [
|
|
649
727
|
"value",
|
|
@@ -671,10 +749,24 @@
|
|
|
671
749
|
},
|
|
672
750
|
"required": {
|
|
673
751
|
"type": "boolean"
|
|
752
|
+
},
|
|
753
|
+
"restoreValue": {
|
|
754
|
+
"type": [
|
|
755
|
+
"string",
|
|
756
|
+
"boolean",
|
|
757
|
+
"number",
|
|
758
|
+
"object",
|
|
759
|
+
"array"
|
|
760
|
+
],
|
|
761
|
+
"description": "Value to restore when credential mode no longer applies."
|
|
762
|
+
},
|
|
763
|
+
"restoreSource": {
|
|
764
|
+
"type": "string",
|
|
765
|
+
"minLength": 1
|
|
674
766
|
}
|
|
675
767
|
}
|
|
676
768
|
},
|
|
677
|
-
"
|
|
769
|
+
"deployRoleAssignments": {
|
|
678
770
|
"type": "object",
|
|
679
771
|
"required": [
|
|
680
772
|
"value",
|
|
@@ -702,10 +794,24 @@
|
|
|
702
794
|
},
|
|
703
795
|
"required": {
|
|
704
796
|
"type": "boolean"
|
|
797
|
+
},
|
|
798
|
+
"restoreValue": {
|
|
799
|
+
"type": [
|
|
800
|
+
"string",
|
|
801
|
+
"boolean",
|
|
802
|
+
"number",
|
|
803
|
+
"object",
|
|
804
|
+
"array"
|
|
805
|
+
],
|
|
806
|
+
"description": "Value to restore when credential mode no longer applies."
|
|
807
|
+
},
|
|
808
|
+
"restoreSource": {
|
|
809
|
+
"type": "string",
|
|
810
|
+
"minLength": 1
|
|
705
811
|
}
|
|
706
812
|
}
|
|
707
813
|
},
|
|
708
|
-
"
|
|
814
|
+
"deploymentEnvironment": {
|
|
709
815
|
"type": "object",
|
|
710
816
|
"required": [
|
|
711
817
|
"value",
|
|
@@ -716,13 +822,12 @@
|
|
|
716
822
|
"properties": {
|
|
717
823
|
"value": {
|
|
718
824
|
"type": [
|
|
825
|
+
"string",
|
|
719
826
|
"boolean",
|
|
827
|
+
"number",
|
|
828
|
+
"object",
|
|
720
829
|
"array"
|
|
721
|
-
]
|
|
722
|
-
"items": {
|
|
723
|
-
"type": "string",
|
|
724
|
-
"pattern": "^[0-9./*-]+$"
|
|
725
|
-
}
|
|
830
|
+
]
|
|
726
831
|
},
|
|
727
832
|
"source": {
|
|
728
833
|
"type": "string",
|
|
@@ -737,7 +842,7 @@
|
|
|
737
842
|
}
|
|
738
843
|
}
|
|
739
844
|
},
|
|
740
|
-
"
|
|
845
|
+
"enableAppInsights": {
|
|
741
846
|
"type": "object",
|
|
742
847
|
"required": [
|
|
743
848
|
"value",
|
|
@@ -748,13 +853,12 @@
|
|
|
748
853
|
"properties": {
|
|
749
854
|
"value": {
|
|
750
855
|
"type": [
|
|
856
|
+
"string",
|
|
751
857
|
"boolean",
|
|
858
|
+
"number",
|
|
859
|
+
"object",
|
|
752
860
|
"array"
|
|
753
|
-
]
|
|
754
|
-
"items": {
|
|
755
|
-
"type": "string",
|
|
756
|
-
"pattern": "^[0-9./*-]+$"
|
|
757
|
-
}
|
|
861
|
+
]
|
|
758
862
|
},
|
|
759
863
|
"source": {
|
|
760
864
|
"type": "string",
|
|
@@ -769,10 +873,7 @@
|
|
|
769
873
|
}
|
|
770
874
|
}
|
|
771
875
|
},
|
|
772
|
-
"
|
|
773
|
-
"$ref": "#/definitions/envReference"
|
|
774
|
-
},
|
|
775
|
-
"deploymentEnvironment": {
|
|
876
|
+
"enableAzureOpenAI": {
|
|
776
877
|
"type": "object",
|
|
777
878
|
"required": [
|
|
778
879
|
"value",
|
|
@@ -803,7 +904,7 @@
|
|
|
803
904
|
}
|
|
804
905
|
}
|
|
805
906
|
},
|
|
806
|
-
"
|
|
907
|
+
"enablePartnerCenterAttribution": {
|
|
807
908
|
"type": "object",
|
|
808
909
|
"required": [
|
|
809
910
|
"value",
|
|
@@ -834,10 +935,7 @@
|
|
|
834
935
|
}
|
|
835
936
|
}
|
|
836
937
|
},
|
|
837
|
-
"
|
|
838
|
-
"$ref": "#/definitions/envReference"
|
|
839
|
-
},
|
|
840
|
-
"acrLoginServer": {
|
|
938
|
+
"enablePostgresPublicAccess": {
|
|
841
939
|
"type": "object",
|
|
842
940
|
"required": [
|
|
843
941
|
"value",
|
|
@@ -848,9 +946,13 @@
|
|
|
848
946
|
"properties": {
|
|
849
947
|
"value": {
|
|
850
948
|
"type": [
|
|
851
|
-
"
|
|
852
|
-
"
|
|
853
|
-
]
|
|
949
|
+
"boolean",
|
|
950
|
+
"array"
|
|
951
|
+
],
|
|
952
|
+
"items": {
|
|
953
|
+
"type": "string",
|
|
954
|
+
"pattern": "^[0-9./*-]+$"
|
|
955
|
+
}
|
|
854
956
|
},
|
|
855
957
|
"source": {
|
|
856
958
|
"type": "string",
|
|
@@ -865,7 +967,10 @@
|
|
|
865
967
|
}
|
|
866
968
|
}
|
|
867
969
|
},
|
|
868
|
-
"
|
|
970
|
+
"encryptionKey": {
|
|
971
|
+
"$ref": "#/definitions/envReference"
|
|
972
|
+
},
|
|
973
|
+
"entraIdClientId": {
|
|
869
974
|
"type": "object",
|
|
870
975
|
"required": [
|
|
871
976
|
"value",
|
|
@@ -875,7 +980,7 @@
|
|
|
875
980
|
"additionalProperties": false,
|
|
876
981
|
"properties": {
|
|
877
982
|
"value": {
|
|
878
|
-
"
|
|
983
|
+
"type": "null"
|
|
879
984
|
},
|
|
880
985
|
"source": {
|
|
881
986
|
"type": "string",
|
|
@@ -887,10 +992,13 @@
|
|
|
887
992
|
},
|
|
888
993
|
"required": {
|
|
889
994
|
"type": "boolean"
|
|
995
|
+
},
|
|
996
|
+
"requiredAt": {
|
|
997
|
+
"const": "tenantActivation"
|
|
890
998
|
}
|
|
891
999
|
}
|
|
892
1000
|
},
|
|
893
|
-
"
|
|
1001
|
+
"entraIdClientSecret": {
|
|
894
1002
|
"type": "object",
|
|
895
1003
|
"required": [
|
|
896
1004
|
"value",
|
|
@@ -900,7 +1008,7 @@
|
|
|
900
1008
|
"additionalProperties": false,
|
|
901
1009
|
"properties": {
|
|
902
1010
|
"value": {
|
|
903
|
-
"
|
|
1011
|
+
"type": "null"
|
|
904
1012
|
},
|
|
905
1013
|
"source": {
|
|
906
1014
|
"type": "string",
|
|
@@ -912,10 +1020,13 @@
|
|
|
912
1020
|
},
|
|
913
1021
|
"required": {
|
|
914
1022
|
"type": "boolean"
|
|
1023
|
+
},
|
|
1024
|
+
"requiredAt": {
|
|
1025
|
+
"const": "tenantActivation"
|
|
915
1026
|
}
|
|
916
1027
|
}
|
|
917
1028
|
},
|
|
918
|
-
"
|
|
1029
|
+
"entraIdTenantId": {
|
|
919
1030
|
"type": "object",
|
|
920
1031
|
"required": [
|
|
921
1032
|
"value",
|
|
@@ -925,10 +1036,7 @@
|
|
|
925
1036
|
"additionalProperties": false,
|
|
926
1037
|
"properties": {
|
|
927
1038
|
"value": {
|
|
928
|
-
"type":
|
|
929
|
-
"string",
|
|
930
|
-
"null"
|
|
931
|
-
]
|
|
1039
|
+
"type": "null"
|
|
932
1040
|
},
|
|
933
1041
|
"source": {
|
|
934
1042
|
"type": "string",
|
|
@@ -940,10 +1048,13 @@
|
|
|
940
1048
|
},
|
|
941
1049
|
"required": {
|
|
942
1050
|
"type": "boolean"
|
|
1051
|
+
},
|
|
1052
|
+
"requiredAt": {
|
|
1053
|
+
"const": "tenantActivation"
|
|
943
1054
|
}
|
|
944
1055
|
}
|
|
945
1056
|
},
|
|
946
|
-
"
|
|
1057
|
+
"infrastructureNameOverride": {
|
|
947
1058
|
"type": "object",
|
|
948
1059
|
"required": [
|
|
949
1060
|
"value",
|
|
@@ -971,24 +1082,10 @@
|
|
|
971
1082
|
},
|
|
972
1083
|
"required": {
|
|
973
1084
|
"type": "boolean"
|
|
974
|
-
},
|
|
975
|
-
"restoreValue": {
|
|
976
|
-
"type": [
|
|
977
|
-
"string",
|
|
978
|
-
"boolean",
|
|
979
|
-
"number",
|
|
980
|
-
"object",
|
|
981
|
-
"array"
|
|
982
|
-
],
|
|
983
|
-
"description": "Value to restore when credential mode no longer applies."
|
|
984
|
-
},
|
|
985
|
-
"restoreSource": {
|
|
986
|
-
"type": "string",
|
|
987
|
-
"minLength": 1
|
|
988
1085
|
}
|
|
989
1086
|
}
|
|
990
1087
|
},
|
|
991
|
-
"
|
|
1088
|
+
"installationResourceModel": {
|
|
992
1089
|
"type": "object",
|
|
993
1090
|
"required": [
|
|
994
1091
|
"value",
|
|
@@ -1016,24 +1113,10 @@
|
|
|
1016
1113
|
},
|
|
1017
1114
|
"required": {
|
|
1018
1115
|
"type": "boolean"
|
|
1019
|
-
},
|
|
1020
|
-
"restoreValue": {
|
|
1021
|
-
"type": [
|
|
1022
|
-
"string",
|
|
1023
|
-
"boolean",
|
|
1024
|
-
"number",
|
|
1025
|
-
"object",
|
|
1026
|
-
"array"
|
|
1027
|
-
],
|
|
1028
|
-
"description": "Value to restore when credential mode no longer applies."
|
|
1029
|
-
},
|
|
1030
|
-
"restoreSource": {
|
|
1031
|
-
"type": "string",
|
|
1032
|
-
"minLength": 1
|
|
1033
1116
|
}
|
|
1034
1117
|
}
|
|
1035
1118
|
},
|
|
1036
|
-
"
|
|
1119
|
+
"keycloakImageTag": {
|
|
1037
1120
|
"type": "object",
|
|
1038
1121
|
"required": [
|
|
1039
1122
|
"value",
|
|
@@ -1064,7 +1147,7 @@
|
|
|
1064
1147
|
}
|
|
1065
1148
|
}
|
|
1066
1149
|
},
|
|
1067
|
-
"
|
|
1150
|
+
"keycloakVerifyAudience": {
|
|
1068
1151
|
"type": "object",
|
|
1069
1152
|
"required": [
|
|
1070
1153
|
"value",
|
|
@@ -1074,7 +1157,13 @@
|
|
|
1074
1157
|
"additionalProperties": false,
|
|
1075
1158
|
"properties": {
|
|
1076
1159
|
"value": {
|
|
1077
|
-
"type":
|
|
1160
|
+
"type": [
|
|
1161
|
+
"string",
|
|
1162
|
+
"boolean",
|
|
1163
|
+
"number",
|
|
1164
|
+
"object",
|
|
1165
|
+
"array"
|
|
1166
|
+
]
|
|
1078
1167
|
},
|
|
1079
1168
|
"source": {
|
|
1080
1169
|
"type": "string",
|
|
@@ -1086,13 +1175,10 @@
|
|
|
1086
1175
|
},
|
|
1087
1176
|
"required": {
|
|
1088
1177
|
"type": "boolean"
|
|
1089
|
-
},
|
|
1090
|
-
"requiredAt": {
|
|
1091
|
-
"const": "tenantActivation"
|
|
1092
1178
|
}
|
|
1093
1179
|
}
|
|
1094
1180
|
},
|
|
1095
|
-
"
|
|
1181
|
+
"licenseEdition": {
|
|
1096
1182
|
"type": "object",
|
|
1097
1183
|
"required": [
|
|
1098
1184
|
"value",
|
|
@@ -1102,7 +1188,8 @@
|
|
|
1102
1188
|
"additionalProperties": false,
|
|
1103
1189
|
"properties": {
|
|
1104
1190
|
"value": {
|
|
1105
|
-
"type": "
|
|
1191
|
+
"type": "string",
|
|
1192
|
+
"pattern": "^(COMMUNITY|STANDARD|ENTERPRISE|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$"
|
|
1106
1193
|
},
|
|
1107
1194
|
"source": {
|
|
1108
1195
|
"type": "string",
|
|
@@ -1114,13 +1201,10 @@
|
|
|
1114
1201
|
},
|
|
1115
1202
|
"required": {
|
|
1116
1203
|
"type": "boolean"
|
|
1117
|
-
},
|
|
1118
|
-
"requiredAt": {
|
|
1119
|
-
"const": "tenantActivation"
|
|
1120
1204
|
}
|
|
1121
1205
|
}
|
|
1122
1206
|
},
|
|
1123
|
-
"
|
|
1207
|
+
"location": {
|
|
1124
1208
|
"type": "object",
|
|
1125
1209
|
"required": [
|
|
1126
1210
|
"value",
|
|
@@ -1130,7 +1214,13 @@
|
|
|
1130
1214
|
"additionalProperties": false,
|
|
1131
1215
|
"properties": {
|
|
1132
1216
|
"value": {
|
|
1133
|
-
"type":
|
|
1217
|
+
"type": [
|
|
1218
|
+
"string",
|
|
1219
|
+
"boolean",
|
|
1220
|
+
"number",
|
|
1221
|
+
"object",
|
|
1222
|
+
"array"
|
|
1223
|
+
]
|
|
1134
1224
|
},
|
|
1135
1225
|
"source": {
|
|
1136
1226
|
"type": "string",
|
|
@@ -1142,13 +1232,10 @@
|
|
|
1142
1232
|
},
|
|
1143
1233
|
"required": {
|
|
1144
1234
|
"type": "boolean"
|
|
1145
|
-
},
|
|
1146
|
-
"requiredAt": {
|
|
1147
|
-
"const": "tenantActivation"
|
|
1148
1235
|
}
|
|
1149
1236
|
}
|
|
1150
1237
|
},
|
|
1151
|
-
"
|
|
1238
|
+
"misoImageTag": {
|
|
1152
1239
|
"type": "object",
|
|
1153
1240
|
"required": [
|
|
1154
1241
|
"value",
|
|
@@ -1158,8 +1245,13 @@
|
|
|
1158
1245
|
"additionalProperties": false,
|
|
1159
1246
|
"properties": {
|
|
1160
1247
|
"value": {
|
|
1161
|
-
"type":
|
|
1162
|
-
|
|
1248
|
+
"type": [
|
|
1249
|
+
"string",
|
|
1250
|
+
"boolean",
|
|
1251
|
+
"number",
|
|
1252
|
+
"object",
|
|
1253
|
+
"array"
|
|
1254
|
+
]
|
|
1163
1255
|
},
|
|
1164
1256
|
"source": {
|
|
1165
1257
|
"type": "string",
|
|
@@ -1174,7 +1266,7 @@
|
|
|
1174
1266
|
}
|
|
1175
1267
|
}
|
|
1176
1268
|
},
|
|
1177
|
-
"
|
|
1269
|
+
"moriBaseUrl": {
|
|
1178
1270
|
"type": "object",
|
|
1179
1271
|
"required": [
|
|
1180
1272
|
"value",
|
|
@@ -1184,9 +1276,12 @@
|
|
|
1184
1276
|
"additionalProperties": false,
|
|
1185
1277
|
"properties": {
|
|
1186
1278
|
"value": {
|
|
1187
|
-
"
|
|
1188
|
-
"
|
|
1189
|
-
"
|
|
1279
|
+
"type": [
|
|
1280
|
+
"string",
|
|
1281
|
+
"boolean",
|
|
1282
|
+
"number",
|
|
1283
|
+
"object",
|
|
1284
|
+
"array"
|
|
1190
1285
|
]
|
|
1191
1286
|
},
|
|
1192
1287
|
"source": {
|
|
@@ -1202,7 +1297,7 @@
|
|
|
1202
1297
|
}
|
|
1203
1298
|
}
|
|
1204
1299
|
},
|
|
1205
|
-
"
|
|
1300
|
+
"moriLicenseIssuer": {
|
|
1206
1301
|
"type": "object",
|
|
1207
1302
|
"required": [
|
|
1208
1303
|
"value",
|
|
@@ -1233,7 +1328,7 @@
|
|
|
1233
1328
|
}
|
|
1234
1329
|
}
|
|
1235
1330
|
},
|
|
1236
|
-
"
|
|
1331
|
+
"moriLicensePublicKey": {
|
|
1237
1332
|
"type": "object",
|
|
1238
1333
|
"required": [
|
|
1239
1334
|
"value",
|
|
@@ -1264,7 +1359,7 @@
|
|
|
1264
1359
|
}
|
|
1265
1360
|
}
|
|
1266
1361
|
},
|
|
1267
|
-
"
|
|
1362
|
+
"moriPolicyPublicKey": {
|
|
1268
1363
|
"type": "object",
|
|
1269
1364
|
"required": [
|
|
1270
1365
|
"value",
|
|
@@ -1295,7 +1390,7 @@
|
|
|
1295
1390
|
}
|
|
1296
1391
|
}
|
|
1297
1392
|
},
|
|
1298
|
-
"
|
|
1393
|
+
"onboardingMode": {
|
|
1299
1394
|
"type": "object",
|
|
1300
1395
|
"required": [
|
|
1301
1396
|
"value",
|
|
@@ -1305,12 +1400,9 @@
|
|
|
1305
1400
|
"additionalProperties": false,
|
|
1306
1401
|
"properties": {
|
|
1307
1402
|
"value": {
|
|
1308
|
-
"
|
|
1309
|
-
"
|
|
1310
|
-
"
|
|
1311
|
-
"number",
|
|
1312
|
-
"object",
|
|
1313
|
-
"array"
|
|
1403
|
+
"enum": [
|
|
1404
|
+
"saasDirect",
|
|
1405
|
+
"customerOwned"
|
|
1314
1406
|
]
|
|
1315
1407
|
},
|
|
1316
1408
|
"source": {
|
|
@@ -1326,7 +1418,7 @@
|
|
|
1326
1418
|
}
|
|
1327
1419
|
}
|
|
1328
1420
|
},
|
|
1329
|
-
"
|
|
1421
|
+
"tags": {
|
|
1330
1422
|
"type": "object",
|
|
1331
1423
|
"required": [
|
|
1332
1424
|
"value",
|
|
@@ -1336,11 +1428,12 @@
|
|
|
1336
1428
|
"additionalProperties": false,
|
|
1337
1429
|
"properties": {
|
|
1338
1430
|
"value": {
|
|
1339
|
-
"
|
|
1340
|
-
"
|
|
1341
|
-
"
|
|
1342
|
-
"
|
|
1343
|
-
"
|
|
1431
|
+
"type": [
|
|
1432
|
+
"string",
|
|
1433
|
+
"boolean",
|
|
1434
|
+
"number",
|
|
1435
|
+
"object",
|
|
1436
|
+
"array"
|
|
1344
1437
|
]
|
|
1345
1438
|
},
|
|
1346
1439
|
"source": {
|
|
@@ -12,6 +12,7 @@ const fsSync = require('fs');
|
|
|
12
12
|
const path = require('path');
|
|
13
13
|
const buildCopy = require('./build-copy');
|
|
14
14
|
const { prepareLocalDataMount } = require('./prepare-local-data-mount');
|
|
15
|
+
const { isScopeActiveForOptions } = require('./environment-scoped-resources');
|
|
15
16
|
const paths = require('./paths');
|
|
16
17
|
const { isSystemBuilderAppName } = require('./paths-system-builder-keys');
|
|
17
18
|
const {
|
|
@@ -279,8 +280,7 @@ function resolveScopedComposeOpts(options) {
|
|
|
279
280
|
effectiveEnvironmentScopedResources: options.effectiveEnvironmentScopedResources === true,
|
|
280
281
|
runEnvKey
|
|
281
282
|
};
|
|
282
|
-
const useScope =
|
|
283
|
-
scopeOpts.effectiveEnvironmentScopedResources && (runEnvKey === 'dev' || runEnvKey === 'tst');
|
|
283
|
+
const useScope = isScopeActiveForOptions(scopeOpts);
|
|
284
284
|
return { scoped: useScope ? scopeOpts : null };
|
|
285
285
|
}
|
|
286
286
|
|