From bd109abb26944549159f2b348959583a15c6ead6 Mon Sep 17 00:00:00 2001 From: khwezi Date: Sat, 9 May 2026 17:11:43 +0200 Subject: [PATCH] Refactored deployment files --- .drone.yml | 14 +-- .editorconfig | 248 ++++++++++++++++++++++++++++++++++++++++ Dockerfile | 8 +- LiteCharmsShop.slnx | 5 + litecharms-shop-uat.yml | 56 ++------- 5 files changed, 275 insertions(+), 56 deletions(-) create mode 100644 .editorconfig diff --git a/.drone.yml b/.drone.yml index e7c4bbb..01edc38 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,12 +29,10 @@ steps: image: plugins/docker settings: registry: nexus.khongisa.co.za - repo: nexus.khongisa.co.za/litecharms-leadgenerator + repo: nexus.khongisa.co.za/litecharms-shop tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ] username: { from_secret: docker_username } - password: { from_secret: docker_password } - dockerfile: shop/Dockerfile - context: . + password: { from_secret: docker_password } - name: gitea-tag image: alpine/git @@ -44,7 +42,7 @@ steps: commands: - git config --global user.email "drone@litecharms.co.za" - git config --global user.name "Drone CI" - - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/leadgenerator.git + - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/litecharmsshop.git - git tag 1.${DRONE_BUILD_NUMBER} - git push origin 1.${DRONE_BUILD_NUMBER} @@ -67,8 +65,8 @@ steps: commands: - mkdir -p $HOME/.kube - echo "$KUBE_CONFIG" > $HOME/.kube/config - - kubectl apply -f shop/litecharms-shop-uat.yml - - kubectl rollout restart deployment/litecharms-leadgenerator -n litecharms-shop-uat + - kubectl apply -f litecharms-shop-uat.yml + - kubectl rollout restart deployment/litecharms-shop -n litecharms-shop-uat depends_on: - package @@ -90,7 +88,7 @@ steps: - mkdir -p $HOME/.kube - echo "$KUBE_CONFIG" > $HOME/.kube/config - kubectl apply -f litecharms-shop.yml - - kubectl rollout restart shop/deployment/litecharms-leadgenerator -n litecharms-shop + - kubectl rollout restart shop/deployment/litecharms-shop -n litecharms-shop depends_on: - uat diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..4a5bdbf --- /dev/null +++ b/.editorconfig @@ -0,0 +1,248 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = space +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = false + +#### .NET Code Actions #### + +# Type members +dotnet_hide_advanced_members = false +dotnet_member_insertion_location = with_other_members_of_the_same_kind +dotnet_property_generation_behavior = prefer_throwing_properties + +# Symbol search +dotnet_search_reference_assemblies = true + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = false +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false +dotnet_style_qualification_for_property = false + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Expression-level preferences +dotnet_prefer_system_hash_code = true +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true +dotnet_style_prefer_collection_expression = when_types_loosely_match +dotnet_style_prefer_compound_assignment = true +dotnet_style_prefer_conditional_expression_over_assignment = true +dotnet_style_prefer_conditional_expression_over_return = true +dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed +dotnet_style_prefer_inferred_anonymous_type_member_names = true +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_non_hidden_explicit_cast_in_source = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Field preferences +dotnet_style_readonly_field = true + +# Parameter preferences +dotnet_code_quality_unused_parameters = all + +# Suppression preferences +dotnet_remove_unnecessary_suppression_exclusions = none + +# New line preferences +dotnet_style_allow_multiple_blank_lines_experimental = true +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = false +csharp_style_var_for_built_in_types = false +csharp_style_var_when_type_is_apparent = false + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true +csharp_style_expression_bodied_constructors = false +csharp_style_expression_bodied_indexers = true +csharp_style_expression_bodied_lambdas = true +csharp_style_expression_bodied_local_functions = true +csharp_style_expression_bodied_methods = false +csharp_style_expression_bodied_operators = false +csharp_style_expression_bodied_properties = true + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call = true + +# Modifier preferences +csharp_prefer_static_anonymous_function = true +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async +csharp_style_prefer_readonly_struct = true +csharp_style_prefer_readonly_struct_member = true + +# Code-block preferences +csharp_prefer_braces = true +csharp_prefer_simple_using_statement = true +csharp_prefer_system_threading_lock = true +csharp_style_namespace_declarations = block_scoped +csharp_style_prefer_method_group_conversion = true +csharp_style_prefer_primary_constructors = true +csharp_style_prefer_simple_property_accessors = true +csharp_style_prefer_top_level_statements = true + +# Expression-level preferences +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_implicitly_typed_lambda_expression = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_unbound_generic_type_in_nameof = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true +csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/Dockerfile b/Dockerfile index cee292d..069c467 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /app COPY ["../nuget.config", "./"] -COPY ["../LeadGenerator/LeadGenerator.csproj", "LeadGenerator/"] -RUN dotnet restore "LeadGenerator/LeadGenerator.csproj" --configfile nuget.config +COPY ["../Shop/Shop.csproj", "Shop/"] +RUN dotnet restore "Shop/Shop.csproj" --configfile nuget.config COPY . . -RUN dotnet publish "../LeadGenerator/LeadGenerator.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "../Shop/Shop.csproj" -c Release -o /app/publish /p:UseAppHost=false # Stage 2: Final Image FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final @@ -22,4 +22,4 @@ COPY --from=build /app/publish . RUN chown -R appuser:appgroup /app USER appuser -ENTRYPOINT ["dotnet", "LeadGenerator.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Shop.dll"] \ No newline at end of file diff --git a/LiteCharmsShop.slnx b/LiteCharmsShop.slnx index 86ba73c..163d897 100644 --- a/LiteCharmsShop.slnx +++ b/LiteCharmsShop.slnx @@ -1,3 +1,8 @@ + + + + + diff --git a/litecharms-shop-uat.yml b/litecharms-shop-uat.yml index a00ddc4..703dfa4 100644 --- a/litecharms-shop-uat.yml +++ b/litecharms-shop-uat.yml @@ -13,11 +13,7 @@ data: ASPNETCORE_ENVIRONMENT: "Development" ASPNETCORE_URLS: "http://0.0.0.0:8080" Monitoring__Address: "http://aspire-dashboard-service.aspire.svc.cluster.local:18889" - Monitoring__ServiceName: "LiteCharms.LeadGenerator.Uat" - Email__Credentials__Username: "shop@litecharms.co.za" - Email__Host: "mail.litecharms.co.za" - Email__Port: "465" - Email__UseSsl: "true" + Monitoring__ServiceName: "LiteCharms.Shop.Uat" --- apiVersion: v1 kind: Secret @@ -26,10 +22,7 @@ metadata: namespace: litecharms-shop-uat type: Opaque data: - connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU= - discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ== - aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw== - email-password: JFpTLWVJQGlYbTVNUCRhfg== + connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU= quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl --- apiVersion: v1 @@ -47,17 +40,17 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: litecharms-leadgenerator + name: litecharms-shop namespace: litecharms-shop-uat spec: replicas: 1 selector: matchLabels: - app: leadgenerator + app: shop template: metadata: labels: - app: leadgenerator + app: shop spec: affinity: nodeAffinity: @@ -67,8 +60,8 @@ spec: - key: node-role.kubernetes.io/control-plane operator: DoesNotExist containers: - - name: leadgenerator - image: nexus.khongisa.co.za/litecharms-leadgenerator:latest + - name: shop + image: nexus.khongisa.co.za/litecharms-shop:latest resources: limits: memory: "512Mi" @@ -82,42 +75,17 @@ spec: - configMapRef: name: shop-config env: - - name: Email__Credentials__Username - valueFrom: - configMapKeyRef: - name: shop-config - key: Email__Credentials__Username - - name: Email__Credentials__Password - valueFrom: - secretKeyRef: - name: shop-secrets - key: email-password - - name: Email__Host - valueFrom: - configMapKeyRef: - name: shop-config - key: Email__Host - - name: Email__Port - valueFrom: - configMapKeyRef: - name: shop-config - key: Email__Port - - name: Email__UseSsl - valueFrom: - configMapKeyRef: - name: shop-config - key: Email__UseSsl - name: ConnectionStrings__PostgresScheduler valueFrom: secretKeyRef: name: shop-secrets key: quartz-store - - name: ConnectionStrings__PostgresLeadGenerator + - name: ConnectionStrings__PostgresShop valueFrom: secretKeyRef: name: shop-secrets key: connection-string - - name: ConnectionStrings__DiscordLeadGenerator + - name: ConnectionStrings__DiscordShop valueFrom: secretKeyRef: name: shop-secrets @@ -161,12 +129,12 @@ spec: apiVersion: v1 kind: Service metadata: - name: leadgenerator-service + name: shop-service namespace: litecharms-shop-uat spec: type: ClusterIP selector: - app: leadgenerator + app: shop ports: - name: http protocol: TCP @@ -185,7 +153,7 @@ spec: - match: Host(`shop.uat.khongisa.co.za`) kind: Rule services: - - name: leadgenerator-service + - name: shop-service port: 80 sticky: cookie: