Turn package name & version warnings into an error

fixes #11321 changelog_begin changelog_end
digital-asset · Nov 24, 2021 · c7f1a85 · c7f1a85
1 parent 970243d
commit c7f1a85
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/compiler/damlc/daml-package-config/src/DA/Daml/Package/Config.hs b/compiler/damlc/daml-package-config/src/DA/Daml/Package/Config.hs
@@ -68,15 +68,15 @@ parseProjectConfig project = do
     pSdkVersion <- queryProjectConfigRequired ["sdk-version"] project
     Right PackageConfigFields {..}
 
-checkPkgConfig :: PackageConfigFields -> [String]
+checkPkgConfig :: PackageConfigFields -> [T.Text]
 checkPkgConfig PackageConfigFields {pName, pVersion} =
-  [ unlines $
-  ["WARNING: Package names should have the format " <> T.unpack packageNameRegex <> "."]
+  [ T.unlines $
+  ["Invalid package name: " <> T.pack (show pName) <> ". Package names should have the format " <> packageNameRegex <> "."]
   ++ errDescription
   | not $ LF.unPackageName pName =~ packageNameRegex
   ] ++
-  [ unlines $
-  ["WARNING: Package versions should have the format " <> T.unpack versionRegex <> "."]
+  [ T.unlines $
+  ["Invalid package version: " <> T.pack (show pVersion) <> ". Package versions should have the format " <> versionRegex <> "."]
   ++ errDescription
   | Just version <- [pVersion]
   , not $ LF.unPackageVersion version =~ versionRegex

diff --git a/compiler/damlc/lib/DA/Cli/Damlc.hs b/compiler/damlc/lib/DA/Cli/Damlc.hs
@@ -614,8 +614,10 @@ execBuild projectOpts opts mbOutFile incrementalBuild initPkgDb =
             withPackageConfig defaultProjectPath $ \pkgConfig@PackageConfigFields{..} -> do
                 loggerH <- getLogger opts "build"
                 Logger.logInfo loggerH $ "Compiling " <> LF.unPackageName pName <> " to a DAR."
-                let warnings = checkPkgConfig pkgConfig
-                unless (null warnings) $ putStrLn $ unlines warnings
+                let errors = checkPkgConfig pkgConfig
+                unless (null errors) $ do
+                    mapM_ (Logger.logError loggerH) errors
+                    exitFailure
                 withDamlIdeState
                     opts
                       { optMbPackageName = Just pName

diff --git a/daml-script/test/BUILD.bazel b/daml-script/test/BUILD.bazel
@@ -58,7 +58,7 @@ genrule(
       cp -L $(location //daml-script/daml:daml-script-1.dev.dar) $$TMP_DIR/
       cat << EOF > $$TMP_DIR/daml.yaml
 sdk-version: {sdk}
-name: script-test-1dev
+name: script-test-v1dev
 version: 0.0.1
 source: daml
 build-options:

diff --git a/docs/daml-intro-7.yaml b/docs/daml-intro-7.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 sdk-version: __VERSION__
-name: 7Dependencies
+name: Dependencies7
 source: docs/source/daml/intro/daml/daml-intro-7/daml/
 version: 1.0.0
 dependencies:

diff --git a/language-support/java/codegen/BUILD.bazel b/language-support/java/codegen/BUILD.bazel
@@ -176,6 +176,7 @@ scala_source_jar(
 [
     daml_compile(
         name = "integration-tests-model-{}".format(mangle_for_java(ver)),
+        project_name = "integration-tests-model",
         srcs = glob(
             [
                 "src/it/daml/Tests/*.daml",

diff --git a/ledger/test-common/test-common.bzl b/ledger/test-common/test-common.bzl
@@ -23,7 +23,7 @@ def da_scala_dar_resources_library(
             # 1. Compile daml files
             daml_compile_name = "%s-tests-%s" % (daml_dir_name, lf_version)
             daml_compile_kwargs = {
-                "project_name": "%s-tests" % daml_dir_name,
+                "project_name": "%s-tests" % daml_dir_name.replace("_", "-"),
                 "srcs": native.glob(["%s/%s/*.daml" % (daml_root_dir, daml_dir_name)]),
                 "target": lf_version,
             }