packwerk-extensions 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558107be67a748dfb9a175b9d90be2acc373913f36a66c5bccbb3401e80cd85f
-  data.tar.gz: fb98b8c64bb3043d267aab3d966d404934a5a530020dc18e3e599a13153fe121
+  metadata.gz: 661762b44e28e84ff3b70007bc039b6f767ddf638524f5a069a832e1f0d2fb34
+  data.tar.gz: a229b9432f95c10b211a411fee200e48721ff8d3c6b3fd1b745f8211cf58038a
 SHA512:
-  metadata.gz: e6beb350fd3089406f7a0ec0409b79f261136b89ffe0ede267215893ca7abb9f5613a7aaf44248f1c0b53560a0596a78739568f85bd2a081edf4b3d0f69fe0d0
-  data.tar.gz: 706bc3779b3af6ce3d6780ba9106a8bb4fc84cd81ddd93c7809b62f2663de1baf4c906f961abc6a4982c8815142478d839054b27c504639e1eb5dc88e0b267e3
+  metadata.gz: 32e5084af7d8e7cba4b743d0be13d29c1ea05b0c6e00ab7d0b9a38a229545093cf21f9e18da883987e487588f5bb7a47cc8728912332c9f295a42b03432bafc3
+  data.tar.gz: 01ff189cc3e645da3eeab3176351ebc0d23d274a9d20269f32733cdb2771169f365857bc946a66e5982c447887f81817fee047b82709e34115f18abaa53a0479

data/lib/packwerk/architecture/validator.rb

@@ -22,11 +22,12 @@ module Packwerk
           results << result
           next if !result.ok?
 
-          result = check_layer_setting(config, f, config['layer'])
+          package = Package.from(package, layers)
+
+          result = check_layer_setting(package, f)
           results << result
           next if !result.ok?
 
-          package = Package.from(package, layers)
           results += check_dependencies_setting(package_set, package, f)
         end
 
@@ -65,17 +66,16 @@ module Packwerk
       end
 
       sig do
-        params(config: T::Hash[T.untyped, T.untyped], config_file_path: String, layer: T.untyped).returns(Result)
+        params(package: Package, config_file_path: String).returns(Result)
       end
-      def check_layer_setting(config, config_file_path, layer)
-        enforce_architecture = config['enforce_architecture']
-        enforce_architecture_enabled = !(enforce_architecture.nil? || enforce_architecture == false)
+      def check_layer_setting(package, config_file_path)
+        layer = package.layer
         valid_layer = layer.nil? || layers.names.include?(layer)
 
-        if layer.nil? && enforce_architecture_enabled
+        if layer.nil? && package.enforces?
           Result.new(
             ok: false,
-            error_value: "Invalid 'layer' option in #{config_file_path.inspect}: #{layer.inspect}. `layer` must be set if `enforce_architecture` is on."
+            error_value: "Invalid 'layer' option in #{config_file_path.inspect}: #{package.layer.inspect}. `layer` must be set if `enforce_architecture` is on."
           )
         elsif valid_layer
           Result.new(ok: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packwerk-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2022-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packwerk